Skip to content

Commit

Permalink
Substitute PEAR_INSTALLDIR only when enabling PEAR (#13994)
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
petk authored Apr 18, 2024
1 parent 6fed6d8 commit 7192379
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -1227,6 +1227,7 @@ if test "$PHP_PEAR" != "no"; then
esac
fi

PHP_SUBST([PEAR_INSTALLDIR])
PHP_ADD_BUILD_DIR([pear])
PHP_ADD_MAKEFILE_FRAGMENT($abs_srcdir/pear/Makefile.frag,$abs_srcdir/pear,pear)
fi
Expand Down Expand Up @@ -1553,7 +1554,6 @@ PHP_SUBST_OLD(INSTALL_IT)
PHP_SUBST(LIBTOOL)
PHP_SUBST(LN_S)
PHP_SUBST_OLD(NATIVE_RPATHS)
PHP_SUBST_OLD(PEAR_INSTALLDIR)
PHP_SUBST_OLD(PHP_LDFLAGS)
PHP_SUBST(OVERALL_TARGET)
PHP_SUBST(PHP_RPATHS)
Expand Down

0 comments on commit 7192379

Please sign in to comment.