summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobin H. Johnson <robbat2@gentoo.org>2003-11-21 05:11:06 +0000
committerRobin H. Johnson <robbat2@gentoo.org>2003-11-21 05:11:06 +0000
commitfa114123ead5727c4157f9f369e89697d558b891 (patch)
tree9513a23eb4a5534d9f5a26cf82af9d50781cbeb2
parentversion bump (diff)
downloadhistorical-fa114123ead5727c4157f9f369e89697d558b891.tar.gz
historical-fa114123ead5727c4157f9f369e89697d558b891.tar.bz2
historical-fa114123ead5727c4157f9f369e89697d558b891.zip
fix bug #33966
-rw-r--r--eclass/php-ext-base.eclass4
-rw-r--r--eclass/php-ext.eclass4
2 files changed, 4 insertions, 4 deletions
diff --git a/eclass/php-ext-base.eclass b/eclass/php-ext-base.eclass
index 2b13d260cdfb..46265d269fcb 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.9 2003/11/07 23:12:06 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/php-ext-base.eclass,v 1.10 2003/11/21 05:11:06 robbat2 Exp $
#
# Author: Tal Peer <coredumb@gentoo.org>
# Author: Stuart Herbert <stuart@gentoo.org>
@@ -30,7 +30,7 @@ EXPORT_FUNCTIONS src_install
[ -z "$PHP_EXT_INI" ] && PHP_EXT_INI="yes"
# find out where to install extensions
-EXT_DIR="`php-config --extension-dir`"
+EXT_DIR="`php-config --extension-dir 2>/dev/null`" ||
# ---end ebuild configurable settings
diff --git a/eclass/php-ext.eclass b/eclass/php-ext.eclass
index 87c3b4c73d02..ab03952b0734 100644
--- a/eclass/php-ext.eclass
+++ b/eclass/php-ext.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.eclass,v 1.4 2003/11/07 23:12:06 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/php-ext.eclass,v 1.5 2003/11/21 05:11:06 robbat2 Exp $
#
# Author: Tal Peer <coredumb@gentoo.org>
#
@@ -70,7 +70,7 @@ php-ext_src_install() {
chmod +x build/shtool
#this will usually be /usr/lib/php/extensions/no-debug-no-zts-20020409/
#but i prefer not taking this risk
- EXT_DIR=`php-config --extension-dir`
+ EXT_DIR="`php-config --extension-dir 2>/dev/null`"
insinto $EXT_DIR
doins modules/$PHP_EXT_NAME.so
}