diff options
| -rw-r--r-- | Makefile.global | 10 | ||||
| -rw-r--r-- | ext/java/Makefile.frag | 6 | ||||
| -rw-r--r-- | ext/rpc/java/Makefile.frag | 6 | ||||
| -rw-r--r-- | pear/Makefile.frag | 17 |
4 files changed, 21 insertions, 18 deletions
diff --git a/Makefile.global b/Makefile.global index 6fb768e5ab..2755e136dd 100644 --- a/Makefile.global +++ b/Makefile.global @@ -26,9 +26,11 @@ install: $(install_targets) install-cli: sapi/cli/php - $(INSTALL_CLI) + @echo "Installing PHP CLI binary: $(INSTALL_ROOT)$(bindir)/" + @$(INSTALL_CLI) install-sapi: libphp4.la + @echo "Installing PHP SAPI module" -@$(LIBTOOL) --silent --mode=install cp libphp4.la $(phptempdir)/libphp4.la >/dev/null 2>&1 -@$(mkinstalldirs) $(INSTALL_ROOT)$(bindir) -@if test ! -r $(phptempdir)/libphp4.$(SHLIB_SUFFIX_NAME); then \ @@ -39,17 +41,17 @@ install-sapi: libphp4.la fi; \ done; \ fi - $(INSTALL_IT) + @$(INSTALL_IT) install-modules: build-modules @test -d modules && \ $(mkinstalldirs) $(INSTALL_ROOT)$(EXTENSION_DIR) && \ - echo "installing shared modules into $(EXTENSION_DIR)" && \ + echo "Installing shared extensions: $(INSTALL_ROOT)$(EXTENSION_DIR)/" && \ rm -f modules/*.la && \ cp modules/* $(INSTALL_ROOT)$(EXTENSION_DIR) >/dev/null 2>&1 || true install-tester: - @echo "Installing regression tester" + @echo "Installing regression tester: $(INSTALL_ROOT)$(PEAR_INSTALLDIR)/" @$(mkinstalldirs) $(PEAR_INSTALLDIR) @$(INSTALL) -m 755 $(top_srcdir)/run-tests.php $(INSTALL_ROOT)$(PEAR_INSTALLDIR) diff --git a/ext/java/Makefile.frag b/ext/java/Makefile.frag index ff2a79a27f..db5d806f05 100644 --- a/ext/java/Makefile.frag +++ b/ext/java/Makefile.frag @@ -2,12 +2,12 @@ $(srcdir)/java.c : $(srcdir)/php_java.jar $(srcdir)/php_java.jar : $(srcdir)/reflect.java - $(mkinstalldirs) $(srcdir)/net/php + @$(mkinstalldirs) $(srcdir)/net/php @cp $(srcdir)/reflect.java $(srcdir)/net/php @echo library=php_java > $(srcdir)/net/php/reflect.properties - $(JAVA_C) $(srcdir)/net/php/reflect.java + @$(JAVA_C) $(srcdir)/net/php/reflect.java @test ! -f reflect.class || mv reflect.class $(srcdir)/net/php # bug in KJC javac - $(JAVA_JAR) $(srcdir)/php_java.jar $(srcdir)/net/php/*.class $(srcdir)/net/php/*.properties + @$(JAVA_JAR) $(srcdir)/php_java.jar $(srcdir)/net/php/*.class $(srcdir)/net/php/*.properties @rm $(srcdir)/net/php/reflect.* @rmdir $(srcdir)/net/php @rmdir $(srcdir)/net diff --git a/ext/rpc/java/Makefile.frag b/ext/rpc/java/Makefile.frag index ff2a79a27f..db5d806f05 100644 --- a/ext/rpc/java/Makefile.frag +++ b/ext/rpc/java/Makefile.frag @@ -2,12 +2,12 @@ $(srcdir)/java.c : $(srcdir)/php_java.jar $(srcdir)/php_java.jar : $(srcdir)/reflect.java - $(mkinstalldirs) $(srcdir)/net/php + @$(mkinstalldirs) $(srcdir)/net/php @cp $(srcdir)/reflect.java $(srcdir)/net/php @echo library=php_java > $(srcdir)/net/php/reflect.properties - $(JAVA_C) $(srcdir)/net/php/reflect.java + @$(JAVA_C) $(srcdir)/net/php/reflect.java @test ! -f reflect.class || mv reflect.class $(srcdir)/net/php # bug in KJC javac - $(JAVA_JAR) $(srcdir)/php_java.jar $(srcdir)/net/php/*.class $(srcdir)/net/php/*.properties + @$(JAVA_JAR) $(srcdir)/php_java.jar $(srcdir)/net/php/*.class $(srcdir)/net/php/*.properties @rm $(srcdir)/net/php/reflect.* @rmdir $(srcdir)/net/php @rmdir $(srcdir)/net diff --git a/pear/Makefile.frag b/pear/Makefile.frag index 91cd3a3625..63a48eab37 100644 --- a/pear/Makefile.frag +++ b/pear/Makefile.frag @@ -53,15 +53,15 @@ peardir=$(PEAR_INSTALLDIR) #PEARCMD=$(top_builddir)/sapi/cli/php -d include_path=$(top_srcdir)/pear pear/scripts/pear.in install-pear-installer: $(top_builddir)/sapi/cli/php - $(top_builddir)/sapi/cli/php $(srcdir)/install-pear.php $(srcdir)/package-*.xml + @$(top_builddir)/sapi/cli/php $(srcdir)/install-pear.php $(srcdir)/package-*.xml install-pear-packages: $(top_builddir)/sapi/cli/php - $(top_builddir)/sapi/cli/php $(srcdir)/install-pear.php $(srcdir)/packages/*.tar + @$(top_builddir)/sapi/cli/php $(srcdir)/install-pear.php $(srcdir)/packages/*.tar install-pear: + @echo "Installing PEAR environment: $(INSTALL_ROOT)$(peardir)/" @if $(mkinstalldirs) $(INSTALL_ROOT)$(peardir); then \ - $(MAKE) install-pear-installer; \ - $(MAKE) install-pear-packages; \ + $(MAKE) -s install-pear-installer install-pear-packages; \ else \ cat $(srcdir)/install-pear.txt; \ exit 5; \ @@ -82,20 +82,21 @@ bin_SCRIPTS = phpize php-config # pear phptar install-build: - @echo "Installing build environment" + @echo "Installing build environment: $(INSTALL_ROOT)$(phpbuilddir)/" @$(mkinstalldirs) $(INSTALL_ROOT)$(phpbuilddir) $(INSTALL_ROOT)$(bindir) && \ (cd $(top_srcdir) && cp $(BUILD_FILES) $(INSTALL_ROOT)$(phpbuilddir)) install-programs: + @echo "Installing helper programs: $(INSTALL_ROOT)$(bindir)/" @for prog in $(bin_SCRIPTS); do \ - echo "Installing program: $$prog"; \ + echo " program: $$prog"; \ $(INSTALL) -m 755 $(builddir)/scripts/$$prog $(INSTALL_ROOT)$(bindir)/$$prog; \ done; \ #for file in $(INSTALL_ROOT)$(bindir)/pearcmd-*.php; do \ # rm -f $$file; \ #done; \ for prog in phpextdist; do \ - echo "Installing program: $$prog"; \ + echo " program: $$prog"; \ $(INSTALL) -m 755 $(srcdir)/scripts/$$prog $(INSTALL_ROOT)$(bindir)/$$prog; \ done @@ -117,7 +118,7 @@ install-headers: paths="$$paths $(INSTALL_ROOT)$(phpincludedir)/$$i"; \ done; \ $(mkinstalldirs) $$paths && \ - echo "Installing header files" && \ + echo "Installing header files: $(INSTALL_ROOT)$(phpincludedir)/" && \ for i in $(HEADER_DIRS); do \ (cd $(top_srcdir)/$$i && cp -p *.h $(INSTALL_ROOT)$(phpincludedir)/$$i; \ cd $(top_builddir)/$$i && cp -p *.h $(INSTALL_ROOT)$(phpincludedir)/$$i) 2>/dev/null || true; \ |