Skip to content
Snippets Groups Projects
Commit a4f8f124 authored by Tom Lane's avatar Tom Lane
Browse files

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

gets us past 'make install', but initdb still fails for lack of conversion
libraries ...
parent 1ef7c5c1
No related branches found
No related tags found
No related merge requests found
......@@ -12,7 +12,9 @@ all: all-shared-lib
include $(top_srcdir)/src/Makefile.shlib
install: all
ifeq ($(enable_shared), yes)
$(INSTALL_SHLIB) $(shlib) $(DESTDIR)$(pkglibdir)/$(NAME)$(DLSUFFIX)
endif
uninstall:
rm -f $(DESTDIR)$(pkglibdir)/$(NAME)$(DLSUFFIX)
......
# Makefile for PL/Perl
# $PostgreSQL: pgsql/src/pl/plperl/GNUmakefile,v 1.11 2003/11/29 19:52:12 pgsql Exp $
# $PostgreSQL: pgsql/src/pl/plperl/GNUmakefile,v 1.12 2004/01/21 19:04:11 tgl Exp $
subdir = src/pl/plperl
top_builddir = ../../..
......@@ -37,7 +37,13 @@ SPI.c: SPI.xs
$(PERL) $(perl_privlibexp)/ExtUtils/xsubpp -typemap $(perl_privlibexp)/ExtUtils/typemap $< >$@
install: all installdirs
ifeq ($(enable_shared), yes)
$(INSTALL_SHLIB) $(shlib) $(DESTDIR)$(pkglibdir)/plperl$(DLSUFFIX)
else
@echo "*****"; \
echo "* PL/Perl was not installed due to lack of shared library support."; \
echo "*****"
endif
installdirs:
$(mkinstalldirs) $(DESTDIR)$(pkglibdir)
......
# $PostgreSQL: pgsql/src/pl/plpython/Makefile,v 1.12 2003/11/29 19:52:12 pgsql Exp $
# $PostgreSQL: pgsql/src/pl/plpython/Makefile,v 1.13 2004/01/21 19:04:11 tgl Exp $
subdir = src/pl/plpython
top_builddir = ../../..
......@@ -32,7 +32,13 @@ include $(top_srcdir)/src/Makefile.shlib
all: all-lib
install: all installdirs
ifeq ($(enable_shared), yes)
$(INSTALL_SHLIB) $(shlib) $(DESTDIR)$(pkglibdir)/plpython$(DLSUFFIX)
else
@echo "*****"; \
echo "* PL/Python was not installed due to lack of shared library support."; \
echo "*****"
endif
installdirs:
$(mkinstalldirs) $(DESTDIR)$(pkglibdir)
......
......@@ -2,7 +2,7 @@
#
# Makefile for the pltcl shared object
#
# $PostgreSQL: pgsql/src/pl/tcl/Makefile,v 1.41 2003/11/29 19:52:13 pgsql Exp $
# $PostgreSQL: pgsql/src/pl/tcl/Makefile,v 1.42 2004/01/21 19:04:11 tgl Exp $
#
#-------------------------------------------------------------------------
......@@ -44,7 +44,13 @@ all: all-lib
$(MAKE) -C modules $@
install: all installdirs
ifeq ($(enable_shared), yes)
$(INSTALL_SHLIB) $(shlib) $(DESTDIR)$(pkglibdir)/$(NAME)$(DLSUFFIX)
else
@echo "*****"; \
echo "* PL/Tcl was not installed due to lack of shared library support."; \
echo "*****"
endif
$(MAKE) -C modules $@
installdirs:
......@@ -60,7 +66,7 @@ else # TCL_SHARED_BUILD = 0
# Provide dummy targets for the case where we can't build the shared library.
all:
@echo "*****"; \
echo "* Cannot build pltcl because Tcl is not a shared library; skipping it."; \
echo "* Cannot build PL/Tcl because Tcl is not a shared library; skipping it."; \
echo "*****"
endif # TCL_SHARED_BUILD = 0
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment