Commita4f8f12

committed

Fix bit-rot in support for building with --disable-shared. This patch

gets us past 'make install', but initdb still fails for lack of conversionlibraries ...

1 parent1ef7c5c commita4f8f12Copy full SHA for a4f8f12

File tree

+24

-4

lines changed

+24

-4

lines changed

Lines changed: 2 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,9 @@ all: all-shared-lib`
`12`	`12`	`include$(top_srcdir)/src/Makefile.shlib`
`13`	`13`
`14`	`14`	`install: all`
	`15`	`+ifeq ($(enable_shared), yes)`
`15`	`16`	`$(INSTALL_SHLIB) $(shlib) $(DESTDIR)$(pkglibdir)/$(NAME)$(DLSUFFIX)`
	`17`	`+endif`
`16`	`18`
`17`	`19`	`uninstall:`
`18`	`20`	`rm -f$(DESTDIR)$(pkglibdir)/$(NAME)$(DLSUFFIX)`

Lines changed: 7 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`# Makefile for PL/Perl`
`2`		`-# $PostgreSQL: pgsql/src/pl/plperl/GNUmakefile,v 1.11 2003/11/29 19:52:12 pgsql Exp $`
	`2`	`+# $PostgreSQL: pgsql/src/pl/plperl/GNUmakefile,v 1.12 2004/01/21 19:04:11 tgl Exp $`
`3`	`3`
`4`	`4`	`subdir = src/pl/plperl`
`5`	`5`	`top_builddir = ../../..`
`@@ -37,7 +37,13 @@ SPI.c: SPI.xs`
`37`	`37`	`$(PERL)$(perl_privlibexp)/ExtUtils/xsubpp -typemap$(perl_privlibexp)/ExtUtils/typemap$<>$@`
`38`	`38`
`39`	`39`	`install: all installdirs`
	`40`	`+ifeq ($(enable_shared), yes)`
`40`	`41`	`$(INSTALL_SHLIB) $(shlib) $(DESTDIR)$(pkglibdir)/plperl$(DLSUFFIX)`
	`42`	`+else`
	`43`	`+@echo "*****"; \`
	`44`	`+ echo "* PL/Perl was not installed due to lack of shared library support."; \`
	`45`	`+ echo "*****"`
	`46`	`+endif`
`41`	`47`
`42`	`48`	`installdirs:`
`43`	`49`	`$(mkinstalldirs)$(DESTDIR)$(pkglibdir)`

Lines changed: 7 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-# $PostgreSQL: pgsql/src/pl/plpython/Makefile,v 1.12 2003/11/29 19:52:12 pgsql Exp $`
	`1`	`+# $PostgreSQL: pgsql/src/pl/plpython/Makefile,v 1.13 2004/01/21 19:04:11 tgl Exp $`
`2`	`2`
`3`	`3`	`subdir = src/pl/plpython`
`4`	`4`	`top_builddir = ../../..`
`@@ -32,7 +32,13 @@ include $(top_srcdir)/src/Makefile.shlib`
`32`	`32`	`all: all-lib`
`33`	`33`
`34`	`34`	`install: all installdirs`
	`35`	`+ifeq ($(enable_shared), yes)`
`35`	`36`	`$(INSTALL_SHLIB) $(shlib) $(DESTDIR)$(pkglibdir)/plpython$(DLSUFFIX)`
	`37`	`+else`
	`38`	`+@echo "*****"; \`
	`39`	`+ echo "* PL/Python was not installed due to lack of shared library support."; \`
	`40`	`+ echo "*****"`
	`41`	`+endif`
`36`	`42`
`37`	`43`	`installdirs:`
`38`	`44`	`$(mkinstalldirs)$(DESTDIR)$(pkglibdir)`

Lines changed: 8 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`	`#`
`3`	`3`	`# Makefile for the pltcl shared object`
`4`	`4`	`#`
`5`		`-# $PostgreSQL: pgsql/src/pl/tcl/Makefile,v 1.41 2003/11/29 19:52:13 pgsql Exp $`
	`5`	`+# $PostgreSQL: pgsql/src/pl/tcl/Makefile,v 1.42 2004/01/21 19:04:11 tgl Exp $`
`6`	`6`	`#`
`7`	`7`	`#-------------------------------------------------------------------------`
`8`	`8`
`@@ -44,7 +44,13 @@ all: all-lib`
`44`	`44`	`$(MAKE) -C modules$@`
`45`	`45`
`46`	`46`	`install: all installdirs`
	`47`	`+ifeq ($(enable_shared), yes)`
`47`	`48`	`$(INSTALL_SHLIB) $(shlib) $(DESTDIR)$(pkglibdir)/$(NAME)$(DLSUFFIX)`
	`49`	`+else`
	`50`	`+@echo "*****"; \`
	`51`	`+ echo "* PL/Tcl was not installed due to lack of shared library support."; \`
	`52`	`+ echo "*****"`
	`53`	`+endif`
`48`	`54`	`$(MAKE) -C modules $@`
`49`	`55`
`50`	`56`	`installdirs:`
`@@ -60,7 +66,7 @@ else # TCL_SHARED_BUILD = 0`
`60`	`66`	`# Provide dummy targets for the case where we can't build the shared library.`
`61`	`67`	`all:`
`62`	`68`	`@echo"*****";\`
`63`		`-echo"* Cannot buildpltcl because Tcl is not a shared library; skipping it.";\`
	`69`	`+echo"* Cannot buildPL/Tcl because Tcl is not a shared library; skipping it.";\`
`64`	`70`	`echo"*****"`
`65`	`71`
`66`	`72`	`endif# TCL_SHARED_BUILD = 0`

Comments

(0)