diff options
| author | Peter Eisentraut <peter_e@gmx.net> | 2008-04-08 09:50:29 +0000 |
|---|---|---|
| committer | Peter Eisentraut <peter_e@gmx.net> | 2008-04-08 09:50:29 +0000 |
| commit | db5f60cb1837d9d62d149f6f814d7069bdff9009 (patch) | |
| tree | 6e42a731eaa68527873bb0bf7cb74b4d69d6456b | |
| parent | bb6f1eb9df00c9009b6aa0402024cd68735db8f1 (diff) | |
| download | postgresql-db5f60cb1837d9d62d149f6f814d7069bdff9009.tar.gz postgresql-db5f60cb1837d9d62d149f6f814d7069bdff9009.zip | |
On cygwin and win32, don't override the shlib name when building a module.
Should fix regression test failures on those platforms.
| -rw-r--r-- | src/Makefile.shlib | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/src/Makefile.shlib b/src/Makefile.shlib index a7d679ee597..4e795e32fe3 100644 --- a/src/Makefile.shlib +++ b/src/Makefile.shlib @@ -6,7 +6,7 @@ # Copyright (c) 1998, Regents of the University of California # # IDENTIFICATION -# $PostgreSQL: pgsql/src/Makefile.shlib,v 1.115 2008/04/07 23:08:15 petere Exp $ +# $PostgreSQL: pgsql/src/Makefile.shlib,v 1.116 2008/04/08 09:50:29 petere Exp $ # #------------------------------------------------------------------------- @@ -311,12 +311,16 @@ ifeq ($(PORTNAME), unixware) endif ifeq ($(PORTNAME), cygwin) - shlib = cyg$(NAME)$(DLSUFFIX) + ifdef SO_MAJOR_VERSION + shlib = cyg$(NAME)$(DLSUFFIX) + endif haslibarule = yes endif ifeq ($(PORTNAME), win32) - shlib = lib$(NAME)$(DLSUFFIX) + ifdef SO_MAJOR_VERSION + shlib = lib$(NAME)$(DLSUFFIX) + endif haslibarule = yes endif |