Skip to content

Commit f3ee713

Browse files
author
foobar
committed
Fix the echo/backquote issues + aclocal
1 parent aea6208 commit f3ee713

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

scripts/phpize.in

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ phpize_print_api_numbers()
6666

6767
phpize_no_shtool()
6868
{
69-
echo <<EOF
69+
cat <<EOF
7070
shtool at '$builddir/build/shtool' not executable.
7171
Make sure that the file exists and is executable and then rerun this script.
7272
@@ -90,16 +90,16 @@ phpize_check_autotools()
9090
test -z "$PHP_AUTOCONF" && PHP_AUTOCONF=autoconf
9191
test -z "$PHP_AUTOHEADER" && PHP_AUTOHEADER=autoheader
9292

93-
if ! test -x "$php_shtool path $PHP_AUTOCONF"; then
94-
echo <<EOF
93+
if ! test -x "`$php_shtool path $PHP_AUTOCONF`"; then
94+
cat <<EOF
9595
Cannot find autoconf. Please check your autoconf installation and the \$PHP_AUTOCONF
9696
environment variable is set correctly and then rerun this script.
9797
9898
EOF
9999
exit 1
100100
fi
101-
if ! test -x "$php_shtool path $PHP_AUTOHEADER"; then
102-
echo <<EOF
101+
if ! test -x "`$php_shtool path $PHP_AUTOHEADER`"; then
102+
cat <<EOF
103103
Cannot find autoheader. Please check your autoconf installation and the \$PHP_AUTOHEADER
104104
environment variable is set correctly and then rerun this script.
105105
@@ -114,7 +114,7 @@ phpize_copy_files()
114114

115115
(cd "$phpdir" && cp $FILES_BUILD "$builddir"/build)
116116
(cd "$phpdir" && cp $FILES "$builddir")
117-
(cd "$builddir" && cat ./build/libtool.m4 >> acinclude.m4)
117+
(cd "$builddir" && cat acinclude.m4 ./build/libtool.m4 > aclocal.m4)
118118
}
119119

120120
phpize_replace_prefix()

0 commit comments

Comments
 (0)