]> granicus.if.org Git - postgresql/commitdiff
On cygwin and win32, don't override the shlib name when building a module.
authorPeter Eisentraut <peter_e@gmx.net>
Tue, 8 Apr 2008 09:50:29 +0000 (09:50 +0000)
committerPeter Eisentraut <peter_e@gmx.net>
Tue, 8 Apr 2008 09:50:29 +0000 (09:50 +0000)
Should fix regression test failures on those platforms.

src/Makefile.shlib

index a7d679ee5972b5496cdeb02853b8933850f32fd5..4e795e32fe322bbe4afc2d64d3bbd8319f059b36 100644 (file)
@@ -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