From b7249ec2a0ce70625c8931a97800c7a80c510a08 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Sur=C3=BD?= <ondrej@sury.org>
Date: Tue, 28 Jul 2015 15:00:53 +0200
Subject: [PATCH] Move the mods-available directory directly under /etc/php

---
 php-helper | 4 ++--
 phpenmod   | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/php-helper b/php-helper
index 6ed4c36..24c51b8 100644
--- a/php-helper
+++ b/php-helper
@@ -129,7 +129,7 @@ get_priority() {
     local sapi=$2
     local modname=$3
 
-    local source_ini="/etc/php/${version}/mods-available/${modname}.ini"
+    local source_ini="/etc/php/mods-available/${modname}.ini"
 
     module_ret=0
     module_exists "$version" "$modname" || module_ret=$?
@@ -163,7 +163,7 @@ get_live_link_content() {
 module_exists() {
     local version=$1
     local modname=$2
-    local source_ini="/etc/php/${version}/mods-available/${modname}.ini"
+    local source_ini="/etc/php/mods-available/${modname}.ini"
 
     if [ ! -r "${source_ini}" ]; then
 	return 1
diff --git a/phpenmod b/phpenmod
index 8f4f9fb..3d5edd3 100755
--- a/phpenmod
+++ b/phpenmod
@@ -135,7 +135,7 @@ enmod() {
     local modname=$3
 
     if ! module_exists "$version" "$modname"; then
-	warning "Module $modname ini file doesn't exist under /etc/php/${version}/mods-available"
+	warning "Module $modname ini file doesn't exist under /etc/php/mods-available"
 	return 1
     fi
 
@@ -197,7 +197,7 @@ dismod() {
 
     if ! module_exists "$version" "$modname"; then
 	if [ "$purge" = "no" ]; then
-	    warning "Module ${modname} ini file doesn't exist under /etc/php/${version}/mods-available"
+	    warning "Module ${modname} ini file doesn't exist under /etc/php/mods-available"
 	    return 1
 	fi
     fi