Teach the system how to use hashing for UNION. (INTERSECT/EXCEPT will follow,

[postgresql] / src / Makefile.shlib

diff --git a/src/Makefile.shlib b/src/Makefile.shlib
index 316b9d1642348481df8144bd235c323a1213afd0..4e795e32fe322bbe4afc2d64d3bbd8319f059b36 100644 (file)
--- 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.114 2008/04/07 14:15:58 petere Exp $
+#    $PostgreSQL: pgsql/src/Makefile.shlib,v 1.116 2008/04/08 09:50:29 petere Exp $
 #
 #-------------------------------------------------------------------------
 
@@ -94,13 +94,13 @@ endif
 # Testing the soname variable is a reliable way to determine whether a
 # linkable library is being built.
 soname         = $(shlib_major)
-stlib          = lib$(NAME).a
 else
 # Naming convention for dynamically loadable modules
 ifeq ($(enable_shared), yes)
 shlib          = $(NAME)$(DLSUFFIX)
 endif
 endif
+stlib          = lib$(NAME).a
 
 ifndef soname
 # additional flags for backend modules
@@ -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