php-ext-base.eclass patch

php-ext-base.patch (text/plain), 1.34 KB, created by Andreas Korthaus on 2005-01-15 08:51:52 UTC

--- /usr/portage/eclass/php-ext-base.eclass     2004-09-05 23:06:41.000000000 +0200
+++ /usr/portage/eclass/php-ext-base.eclass     2005-01-15 17:22:44.000000000 +0100
@@ -31,6 +31,7 @@

 # find out where to install extensions
 EXT_DIR="`php-config --extension-dir 2>/dev/null`"
+PHP_MAJOR_VERSION="`php-config --version  | awk '{print substr($1, 1, 1)}' 2>/dev/null`"

 # ---end ebuild configurable settings

@@ -52,16 +53,16 @@
        PHPINIFILELIST=

        for x in ${PHPSAPILIST} ; do
-               if [ -f /etc/php/${x}-php4/php.ini ]; then
-                       PHPINIFILELIST="${PHPINIFILELIST} etc/php/${x}-php4/php.ini"
+               if [ -f /etc/php/${x}-php${PHP_MAJOR_VERSION}/php.ini ]; then
+                       PHPINIFILELIST="${PHPINIFILELIST} etc/php/${x}-php${PHP_MAJOR_VERSION}/php.ini"
                fi
        done

        if [ "${PHPINIFILELIST}+" = "+" ] ; then
                # backwards support for the old location

-               if [ -f /etc/php4/php.ini ] ; then
-                       PHPINIFILELIST="etc/php4/php.ini"
+               if [ -f /etc/php${PHP_MAJOR_VERSION}/php.ini ] ; then
+                       PHPINIFILELIST="etc/php${PHP_MAJOR_VERSION}/php.ini"
                else
                        msg="No PHP ini files found for this extension"
                        eerror ${msg}