* tidy up "make install" output

2 files changed, 13 insertions, 8 deletions

diff --git a/Makefile.in b/Makefile.in
index 0bb067c87d..471a102e8e 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -32,7 +32,7 @@ include $(top_srcdir)/build/program.mk
 
 install-sapi:
 	@$(LIBTOOL) --silent --mode=install cp libphp4.la $(phptempdir)/libphp4.la >/dev/null 2>&1
-	-@$(mkinstalldirs) $(INSTALL_ROOT)$(bindir)
+	@$(mkinstalldirs) $(INSTALL_ROOT)$(bindir)
 	-@if test ! -r $(phptempdir)/libphp4.$(SHLIB_SUFFIX_NAME); then \
 		for i in 0.0.0 0.0 0; do \
 			if test -r $(phptempdir)/libphp4.$(SHLIB_SUFFIX_NAME).$$i; then \
@@ -51,8 +51,9 @@ install-modules:
 	cp modules/* $(INSTALL_ROOT)$(moduledir) >/dev/null 2>&1 || true
 
 install-tester:
-	-$(mkinstalldirs) $(datadir)
-	$(INSTALL) -m 755 $(srcdir)/run-tests.php $(INSTALL_ROOT)$(datadir)
+	@echo "Installing regression tester"
+	@$(mkinstalldirs) $(PEAR_INSTALLDIR)
+	@$(INSTALL) -m 755 $(srcdir)/run-tests.php $(INSTALL_ROOT)$(PEAR_INSTALLDIR)
 
 install-pear: install-modules
 	(cd pear && $(MAKE) install)
diff --git a/pear/Makefile.in b/pear/Makefile.in
index 154fa69b0f..b5343f342a 100644
--- a/pear/Makefile.in
+++ b/pear/Makefile.in
@@ -109,11 +109,12 @@ PEAR_FILES = \
 install-data-local:
 	@if $(mkinstalldirs) $(INSTALL_ROOT)$(peardir); then \
 		for i in $(PEAR_SUBDIRS); do \
-			(set -x;$(mkinstalldirs) $(INSTALL_ROOT)$(peardir)/$$i); \
+			$(mkinstalldirs) $(INSTALL_ROOT)$(peardir)/$$i; \
 		done; \
 		for i in $(PEAR_FILES); do \
+			echo "Installing $$i"; \
 			dir=`echo $$i|sed 's%[^/][^/]*$$%%'`; \
-			(set -x;$(INSTALL_DATA) $(srcdir)/$$i $(INSTALL_ROOT)$(peardir)/$$dir); \
+			$(INSTALL_DATA) $(srcdir)/$$i $(INSTALL_ROOT)$(peardir)/$$dir; \
 		done; \
 	else \
 		cat $(srcdir)/install-pear.txt; \
@@ -141,14 +142,17 @@ BUILD_FILES = \
 bin_SCRIPTS = phpize php-config pear pearize phptar
 
 install-build:
-	$(mkinstalldirs) $(INSTALL_ROOT)$(phpbuilddir) $(INSTALL_ROOT)$(bindir) && \
+	@echo "Installing build environment"
+	@$(mkinstalldirs) $(INSTALL_ROOT)$(phpbuilddir) $(INSTALL_ROOT)$(bindir) && \
 	(cd $(top_srcdir) && cp $(BUILD_FILES) $(INSTALL_ROOT)$(phpbuilddir))
 
 install-programs:
-	for prog in $(bin_SCRIPTS); do \
+	@for prog in $(bin_SCRIPTS); do \
+		echo "Installing program: $$prog"; \
 		$(INSTALL) -m 755 scripts/$$prog $(INSTALL_ROOT)$(bindir)/$$prog; \
 	done; \
 	for prog in phpextdist; do \
+		echo "Installing program: $$prog"; \
 		$(INSTALL) -m 755 $(srcdir)/scripts/$$prog $(INSTALL_ROOT)$(bindir)/$$prog; \
 	done
 
@@ -168,7 +172,7 @@ install-headers:
 		paths="$$paths $(INSTALL_ROOT)$(phpincludedir)/$$i"; \
 	done; \
 	$(mkinstalldirs) $$paths && \
-	echo "creating header file hierarchy" && \
+	echo "Installing header files" && \
 	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; \