diff options
| author |   Stuart Herbert <stuart@gentoo.org> | 2003-08-03 19:26:02 +0000 |
|---|---|---|
| committer | Stuart Herbert <stuart@gentoo.org> | 2003-08-03 19:26:02 +0000 |
| commit | 6df731a4ff1e4105e7c06b5514cecfc72226c95f (patch) | |
| tree | 9a1f9f301c7ed353580d0454dd38f23b3bc7930d /eclass | |
| parent | Fix for bug #24294 (diff) | |
| download | gentoo-2-6df731a4ff1e4105e7c06b5514cecfc72226c95f.tar.gz gentoo-2-6df731a4ff1e4105e7c06b5514cecfc72226c95f.tar.bz2 gentoo-2-6df731a4ff1e4105e7c06b5514cecfc72226c95f.zip | |
Added acknowledgement of Ian Leitch's contribution
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/php-ext-base.eclass | 18 | ||||
| -rw-r--r-- | eclass/webapp-apache.eclass | 5 |
2 files changed, 16 insertions, 7 deletions
diff --git a/eclass/php-ext-base.eclass b/eclass/php-ext-base.eclass index da1ae6109508..f2c3c884dd56 100644 --- a/eclass/php-ext-base.eclass +++ b/eclass/php-ext-base.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2003 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/php-ext-base.eclass,v 1.3 2003/07/25 10:42:59 stuart Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/php-ext-base.eclass,v 1.4 2003/08/03 19:26:02 stuart Exp $ # # Author: Tal Peer <coredumb@gentoo.org> # Author: Stuart Herbert <stuart@gentoo.org> @@ -55,9 +55,15 @@ php-ext-base_buildinilist () { done if [[ ${PHPINIFILELIST} = "" ]]; then - msg="No PHP ini files found for this extension" - eerror ${msg} - die ${msg} + # backwards support for the old location + + if [ -f /etc/php4/php.ini ] ; then + PHPINIFILELIST="etc/php4/php.ini" + else + msg="No PHP ini files found for this extension" + eerror ${msg} + die ${msg} + fi fi # einfo "php.ini files found in $PHPINIFILELIST" @@ -65,7 +71,6 @@ php-ext-base_buildinilist () { php-ext-base_src_install() { if [ "$PHP_EXT_INI" = "yes" ] ; then - php-ext-base_buildinilist php-ext-base_addextension "${PHP_EXT_NAME}.so" fi } @@ -126,4 +131,7 @@ php-ext-base_addtoinifiles () { done } +# now, we build the INI file list for use in this class + +php-ext-base_buildinilist diff --git a/eclass/webapp-apache.eclass b/eclass/webapp-apache.eclass index 221e174ff533..636eb4c4b7d2 100644 --- a/eclass/webapp-apache.eclass +++ b/eclass/webapp-apache.eclass @@ -1,11 +1,12 @@ # Copyright 1999-2003 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/webapp-apache.eclass,v 1.1 2003/08/03 19:20:11 stuart Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/webapp-apache.eclass,v 1.2 2003/08/03 19:26:02 stuart Exp $ # # Author: Stuart Herbert <stuart@gentoo.org> # # Based on discussions held on gentoo-dev mailing list, and a bug report -# contributed by <??> in bug #14870, and robbat2's mod_php ebuild +# contributed by Ian Leitch <port001@w0r.mine.nu> in bug #14870, +# and robbat2's mod_php ebuild ECLASS=webapp-apache INHERITED="$INHERITED $ECLASS" |