Skip to content

Commit 7192379

Browse files
authored
Substitute PEAR_INSTALLDIR only when enabling PEAR (#13994)
When not using --with-pear configure option, the Makefile doesn't need the PEAR_INSTALLDIR variable. Also, this variable isn't directly substituted using the @PEAR_INSTALLDIR@ in any template, so the PHP_SUBST can be used.
1 parent 6fed6d8 commit 7192379

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

configure.ac

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1227,6 +1227,7 @@ if test "$PHP_PEAR" != "no"; then
12271227
esac
12281228
fi
12291229

1230+
PHP_SUBST([PEAR_INSTALLDIR])
12301231
PHP_ADD_BUILD_DIR([pear])
12311232
PHP_ADD_MAKEFILE_FRAGMENT($abs_srcdir/pear/Makefile.frag,$abs_srcdir/pear,pear)
12321233
fi
@@ -1553,7 +1554,6 @@ PHP_SUBST_OLD(INSTALL_IT)
15531554
PHP_SUBST(LIBTOOL)
15541555
PHP_SUBST(LN_S)
15551556
PHP_SUBST_OLD(NATIVE_RPATHS)
1556-
PHP_SUBST_OLD(PEAR_INSTALLDIR)
15571557
PHP_SUBST_OLD(PHP_LDFLAGS)
15581558
PHP_SUBST(OVERALL_TARGET)
15591559
PHP_SUBST(PHP_RPATHS)

0 commit comments

Comments
 (0)