sniper Thu Apr 7 18:03:04 2005 EDT
Modified files:
/php-src/scripts phpize.in
Log:
Fix the echo/backquote issues + aclocal
http://cvs.php.net/diff.php/php-src/scripts/phpize.in?r1=1.19&r2=1.20&ty=u
Index: php-src/scripts/phpize.in
diff -u php-src/scripts/phpize.in:1.19 php-src/scripts/phpize.in:1.20
--- php-src/scripts/phpize.in:1.19 Thu Apr 7 02:25:28 2005
+++ php-src/scripts/phpize.in Thu Apr 7 18:03:02 2005
@@ -66,7 +66,7 @@
phpize_no_shtool()
{
- echo <<EOF
+ cat <<EOF
shtool at '$builddir/build/shtool' not executable.
Make sure that the file exists and is executable and then rerun this script.
@@ -90,16 +90,16 @@
test -z "$PHP_AUTOCONF" && PHP_AUTOCONF=autoconf
test -z "$PHP_AUTOHEADER" && PHP_AUTOHEADER=autoheader
- if ! test -x "$php_shtool path $PHP_AUTOCONF"; then
- echo <<EOF
+ if ! test -x "`$php_shtool path $PHP_AUTOCONF`"; then
+ cat <<EOF
Cannot find autoconf. Please check your autoconf installation and the
\$PHP_AUTOCONF
environment variable is set correctly and then rerun this script.
EOF
exit 1
fi
- if ! test -x "$php_shtool path $PHP_AUTOHEADER"; then
- echo <<EOF
+ if ! test -x "`$php_shtool path $PHP_AUTOHEADER`"; then
+ cat <<EOF
Cannot find autoheader. Please check your autoconf installation and the
\$PHP_AUTOHEADER
environment variable is set correctly and then rerun this script.
@@ -114,7 +114,7 @@
(cd "$phpdir" && cp $FILES_BUILD "$builddir"/build)
(cd "$phpdir" && cp $FILES "$builddir")
- (cd "$builddir" && cat ./build/libtool.m4 >> acinclude.m4)
+ (cd "$builddir" && cat acinclude.m4 ./build/libtool.m4 > aclocal.m4)
}
phpize_replace_prefix()
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
