Invoke pear-related targets conditionally and

rename install-data-local target to install-pear.
Also remove PEAR_DIR, because it is unused.

diff --git a/configure.in b/configure.in
index 618d54a0122ce471e94a2df7a3e45f2e37f96bde..09e5467102fabc58b03cf4caf212a863e1255eb6 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -614,7 +614,7 @@ PHP_ARG_WITH(pear, [whether to install PEAR, and where],
   --without-pear          Do not install PEAR], DEFAULT)
 
 if test "$PHP_PEAR" != "no"; then
-  PEAR_DIR=pear
+  install_pear="install-pear install-build install-headers install-programs"
   PEAR_INSTALLDIR=$PHP_PEAR
 fi
 
@@ -1000,7 +1000,6 @@ PHP_SUBST(LFLAGS)
 PHP_SUBST(LIBTOOL)
 PHP_SUBST(LN_S)
 PHP_SUBST_OLD(NATIVE_RPATHS)
-PHP_SUBST(PEAR_DIR)
 PHP_SUBST_OLD(PEAR_INSTALLDIR)
 PHP_SUBST(PHP_BUILD_DATE)
 PHP_SUBST(PHP_COMPILE)
@@ -1058,7 +1057,7 @@ INLINE_CFLAGS="$INLINE_CFLAGS $standard_libtool_flag"
 CXXFLAGS="$CXXFLAGS $standard_libtool_flag"
 
 all_targets='$(OVERALL_TARGET) $(PHP_MODULES) $(PHP_CLI_TARGET)'
-install_targets='install-sapi install-modules install-cli install-data-local install-headers install-build install-programs'
+install_targets="install-sapi install-modules install-cli $install_pear"
 PHP_SUBST(all_targets)
 PHP_SUBST(install_targets)
 

diff --git a/pear/Makefile.frag b/pear/Makefile.frag
index bb35f75e7e244bfdd43900973219662e121c02a5..11362207d47ff808780b3979a0dfad308a31d78c 100644 (file)
--- a/pear/Makefile.frag
+++ b/pear/Makefile.frag
@@ -90,7 +90,7 @@ PEAR_COMMAND_LIBS = \
        pearcmd-show-config.php \
        pearcmd-uninstall.php
 
-install-data-local:
+install-pear:
        @if $(mkinstalldirs) $(INSTALL_ROOT)$(peardir); then \
                for i in $(PEAR_SUBDIRS); do \
                        $(mkinstalldirs) $(INSTALL_ROOT)$(peardir)/$$i; \