archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-16 05:58:45 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

- Only add 'install-modules' into install targets when there are such

Browse source 
modules to install.
This commit is contained in:
foobar 2003-12-04 15:57:55 +00:00
parent 9555db802d
commit e13e315a10
3 changed files with 6 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Makefile.global
View file

@ -38,10 +38,10 @@ install-sapi: $(OVERALL_TARGET)
install-modules: build-modules install-modules: build-modules
@test -d modules && \ @test -d modules && \
$(mkinstalldirs) $(INSTALL_ROOT)$(EXTENSION_DIR) && \ $(mkinstalldirs) $(INSTALL_ROOT)$(EXTENSION_DIR)
echo "Installing shared extensions: $(INSTALL_ROOT)$(EXTENSION_DIR)/" && \ @echo "Installing shared extensions: $(INSTALL_ROOT)$(EXTENSION_DIR)/"
rm -f modules/*.la && \ @rm -f modules/*.la >/dev/null 2>&1
$(INSTALL) modules/* $(INSTALL_ROOT)$(EXTENSION_DIR) >/dev/null 2>&1 || true @$(INSTALL) modules/* $(INSTALL_ROOT)$(EXTENSION_DIR)
install-tester: install-tester:
@echo "Installing regression tester: $(INSTALL_ROOT)$(PEAR_INSTALLDIR)/" @echo "Installing regression tester: $(INSTALL_ROOT)$(PEAR_INSTALLDIR)/"

1
acinclude.m4
View file

@ -1153,6 +1153,7 @@ dnl Basically sets up the link-stage for building module-name
dnl from object_var in build-dir. dnl from object_var in build-dir.
dnl dnl
AC_DEFUN([PHP_SHARED_MODULE],[ AC_DEFUN([PHP_SHARED_MODULE],[
install_modules="install-modules"
PHP_MODULES="$PHP_MODULES \$(phplibdir)/$1.la" PHP_MODULES="$PHP_MODULES \$(phplibdir)/$1.la"
PHP_SUBST($2) PHP_SUBST($2)
cat >>Makefile.objects<<EOF cat >>Makefile.objects<<EOF

2
configure.in
View file

@ -1149,7 +1149,7 @@ INLINE_CFLAGS="$INLINE_CFLAGS $standard_libtool_flag"
CXXFLAGS="$CXXFLAGS $standard_libtool_flag" CXXFLAGS="$CXXFLAGS $standard_libtool_flag"
all_targets='$(OVERALL_TARGET) $(PHP_MODULES) $(PHP_CLI_TARGET)' all_targets='$(OVERALL_TARGET) $(PHP_MODULES) $(PHP_CLI_TARGET)'
install_targets="install-modules $install_pear install-build install-headers install-programs" install_targets="$install_modules $install_pear install-build install-headers install-programs"
case $PHP_SAPI in case $PHP_SAPI in
cgi) cgi)