Still another round of Perl-module installation tweaks.

This time, src/interfaces/perl5/Makefile.PL no longer needs to be autoconf'd.

diff --git a/src/GNUmakefile.in b/src/GNUmakefile.in
index 906e4fb..60a5a06 100644 (file)
--- a/src/GNUmakefile.in
+++ b/src/GNUmakefile.in
@@ -7,7 +7,7 @@
 #
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/Attic/GNUmakefile.in,v 1.39 1998/10/17 03:49:59 momjian Exp $
+#    $Header: /cvsroot/pgsql/src/Attic/GNUmakefile.in,v 1.40 1998/10/18 02:33:54 tgl Exp $
 #
 #-------------------------------------------------------------------------
 
@@ -102,7 +102,6 @@ distclean: clean
                interfaces/libpgtcl/Makefile \
                interfaces/odbc/GNUmakefile \
                interfaces/odbc/Makefile.global \
-               interfaces/perl5/Makefile.PL \
                pl/plpgsql/src/Makefile \
                pl/plpgsql/src/mklang.sql \
                pl/tcl/mkMakefile.tcldefs.sh

diff --git a/src/configure b/src/configure
index 1391fb3..96e2b1c 100755 (executable)
--- a/src/configure
+++ b/src/configure
@@ -6316,7 +6316,6 @@ trap 'rm -fr `echo "GNUmakefile
        interfaces/libpgtcl/Makefile
        interfaces/odbc/GNUmakefile
        interfaces/odbc/Makefile.global
-       interfaces/perl5/Makefile.PL
        pl/plpgsql/src/Makefile
        pl/plpgsql/src/mklang.sql
        pl/tcl/mkMakefile.tcldefs.sh
@@ -6479,7 +6478,6 @@ CONFIG_FILES=\${CONFIG_FILES-"GNUmakefile
        interfaces/libpgtcl/Makefile
        interfaces/odbc/GNUmakefile
        interfaces/odbc/Makefile.global
-       interfaces/perl5/Makefile.PL
        pl/plpgsql/src/Makefile
        pl/plpgsql/src/mklang.sql
        pl/tcl/mkMakefile.tcldefs.sh

diff --git a/src/configure.in b/src/configure.in
index 074f00c..5a67978 100644 (file)
--- a/src/configure.in
+++ b/src/configure.in
@@ -891,7 +891,6 @@ AC_OUTPUT(
        interfaces/libpgtcl/Makefile
        interfaces/odbc/GNUmakefile
        interfaces/odbc/Makefile.global
-       interfaces/perl5/Makefile.PL
        pl/plpgsql/src/Makefile
        pl/plpgsql/src/mklang.sql
        pl/tcl/mkMakefile.tcldefs.sh

diff --git a/src/interfaces/Makefile b/src/interfaces/Makefile
index 43a4c5a..82e503c 100644 (file)
--- a/src/interfaces/Makefile
+++ b/src/interfaces/Makefile
@@ -7,7 +7,7 @@
 #
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/interfaces/Makefile,v 1.18 1998/10/16 15:31:04 momjian Exp $
+#    $Header: /cvsroot/pgsql/src/interfaces/Makefile,v 1.19 1998/10/18 02:33:56 tgl Exp $
 #
 #-------------------------------------------------------------------------
 
@@ -15,7 +15,10 @@ SRCDIR= ..
 include $(SRCDIR)/Makefile.global
 
 
-PERL_CLEAN := DO_NOTHING
+# Note: the klugery for perl5 is to ensure that the perl5 shared lib
+# gets built with the correct path to the installed location of libpq
+# during "make install", but is built against the local tree during
+# ordinary building and testing.
 
 .DEFAULT all install clean dep depend distclean:
        $(MAKE) -C libpq $@
@@ -29,9 +32,12 @@ ifeq ($(USE_TCL), true)
        $(MAKE) -C libpgtcl $@
 endif
 ifeq ($(USE_PERL), true)
-       -$(MAKE) -C perl5 $(PERL_CLEAN)
-       $(MAKE) perl5/Makefile
-       $(MAKE) -C perl5 $@
+       if [ "$@" = "install" ]; then \
+               $(MAKE) $(MFLAGS) install-perl5; \
+       else \
+               $(MAKE) $(MFLAGS) perl5/Makefile; \
+               $(MAKE) $(MFLAGS) -C perl5 $@; \
+       fi
 endif
 ifeq ($(USE_ODBC), true)
        $(MAKE) -C odbc $@
@@ -39,3 +45,11 @@ endif
 
 perl5/Makefile: perl5/Makefile.PL
        cd perl5 && perl Makefile.PL
+
+install-perl5:
+       $(MAKE) -C perl5 clean
+       cd perl5 && POSTGRES_HOME="$(POSTGRESDIR)" perl Makefile.PL
+       $(MAKE) -C perl5 install
+       rm -f perl5/Makefile
+
+.PHONY: install-perl5