Gentoo Archives: gentoo-commits

From: "Markus Ullmann (jokey)" <jokey@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in eclass: php-common-r1.eclass
Date: Thu, 29 Nov 2007 23:11:09
Message-Id: E1IxsXB-0005cg-4g@stork.gentoo.org
1 jokey 07/11/29 23:11:05
2
3 Modified: php-common-r1.eclass
4 Log:
5 Don't use backticks
6
7 Revision Changes Path
8 1.12 eclass/php-common-r1.eclass
9
10 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/php-common-r1.eclass?rev=1.12&view=markup
11 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/php-common-r1.eclass?rev=1.12&content-type=text/plain
12 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/php-common-r1.eclass?r1=1.11&r2=1.12
13
14 Index: php-common-r1.eclass
15 ===================================================================
16 RCS file: /var/cvsroot/gentoo-x86/eclass/php-common-r1.eclass,v
17 retrieving revision 1.11
18 retrieving revision 1.12
19 diff -u -r1.11 -r1.12
20 --- php-common-r1.eclass 1 Sep 2007 15:58:17 -0000 1.11
21 +++ php-common-r1.eclass 29 Nov 2007 23:11:04 -0000 1.12
22 @@ -1,6 +1,6 @@
23 # Copyright 1999-2007 Gentoo Foundation
24 # Distributed under the terms of the GNU General Public License v2
25 -# $Header: /var/cvsroot/gentoo-x86/eclass/php-common-r1.eclass,v 1.11 2007/09/01 15:58:17 jokey Exp $
26 +# $Header: /var/cvsroot/gentoo-x86/eclass/php-common-r1.eclass,v 1.12 2007/11/29 23:11:04 jokey Exp $
27
28 # Based on robbat2's work on the php4 sapi eclass
29 # Based on stuart's work on the php5 sapi eclass
30 @@ -72,7 +72,7 @@
31 return
32 fi
33
34 - JDKHOME="`java-config --jdk-home`"
35 + JDKHOME="$(java-config --jdk-home)"
36 NOJDKERROR="You need to use the 'java-config' utility to set your JVM to a JDK!"
37 if [[ -z "${JDKHOME}" ]] || [[ ! -d "${JDKHOME}" ]] ; then
38 eerror "${NOJDKERROR}"
39 @@ -132,7 +132,7 @@
40 return
41 fi
42
43 - JAVA_LIBRARY="`grep -- '-DJAVALIB' Makefile | sed -e 's,.\+-DJAVALIB=\"\([^"]*\)\".*$,\1,g;' | sort -u`"
44 + JAVA_LIBRARY="$(grep -- '-DJAVALIB' Makefile | sed -e 's,.\+-DJAVALIB=\"\([^"]*\)\".*$,\1,g;' | sort -u)"
45
46 echo "extension = java.so" >> "${D}/${PHP_EXT_INI_DIR}/java.ini"
47 echo "java.library = ${JAVA_LIBRARY}" >> "${D}/${PHP_EXT_INI_DIR}/java.ini"
48
49
50
51 --
52 gentoo-commits@g.o mailing list