php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-03-24 00:02:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

Substitute PEAR_INSTALLDIR only when enabling PEAR (#13994)

Browse Source 
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.
This commit is contained in:
Peter Kokot
2024-04-18 23:05:46 +02:00
committed by GitHub
parent 6fed6d85db
commit 719237954b
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
configure.ac
View File

@@ -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
@@ -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)