diff options
Diffstat (limited to 'src/backend/utils')
-rw-r--r-- | src/backend/utils/mb/conversion_procs/Makefile | 6 | ||||
-rw-r--r-- | src/backend/utils/mb/conversion_procs/proc.mk | 2 |
2 files changed, 7 insertions, 1 deletions
diff --git a/src/backend/utils/mb/conversion_procs/Makefile b/src/backend/utils/mb/conversion_procs/Makefile index 52f396b4511..6b406cae542 100644 --- a/src/backend/utils/mb/conversion_procs/Makefile +++ b/src/backend/utils/mb/conversion_procs/Makefile @@ -4,7 +4,7 @@ # Makefile for utils/mb/conversion_procs # # IDENTIFICATION -# $Header: /cvsroot/pgsql/src/backend/utils/mb/conversion_procs/Makefile,v 1.9 2003/08/23 04:22:34 petere Exp $ +# $Header: /cvsroot/pgsql/src/backend/utils/mb/conversion_procs/Makefile,v 1.9.2.1 2004/01/21 19:25:11 tgl Exp $ # #------------------------------------------------------------------------- @@ -147,6 +147,7 @@ all: $(SQLSCRIPT) @for dir in $(DIRS); do $(MAKE) -C $$dir $@ || exit; done $(SQLSCRIPT): Makefile +ifeq ($(enable_shared), yes) @set $(CONVERSIONS) ; \ while [ "$$#" -gt 0 ] ; \ do \ @@ -160,6 +161,9 @@ $(SQLSCRIPT): Makefile echo "DROP CONVERSION pg_catalog.$$name;"; \ echo "CREATE DEFAULT CONVERSION pg_catalog.$$name FOR '$$se' TO '$$de' FROM $$func;"; \ done > $@ +else + echo "-- No conversion support, for lack of shared library support" > $@ +endif $(REGRESSION_SCRIPT): Makefile @cp regress_prolog $@; \ diff --git a/src/backend/utils/mb/conversion_procs/proc.mk b/src/backend/utils/mb/conversion_procs/proc.mk index 0e66f375185..91b2304cac7 100644 --- a/src/backend/utils/mb/conversion_procs/proc.mk +++ b/src/backend/utils/mb/conversion_procs/proc.mk @@ -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) |