From bb85f1b9b13f0a94e782c3ada9e21aa1ba98cc7a Mon Sep 17 00:00:00 2001
From: Tom Lane <tgl@sss.pgh.pa.us>
Date: Tue, 16 Nov 2004 21:51:13 +0000
Subject: [PATCH] Suppress duplicate rules for lib$(NAME).a on WIN32 and
 Cygwin. Andrew Dunstan

---
 src/Makefile.shlib | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/Makefile.shlib b/src/Makefile.shlib
index 4bd3565545..274e11fcb4 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.86 2004/10/16 03:26:43 momjian Exp $
+#    $PostgreSQL: pgsql/src/Makefile.shlib,v 1.87 2004/11/16 21:51:13 tgl Exp $
 #
 #-------------------------------------------------------------------------
 
@@ -220,10 +220,12 @@ ifeq ($(PORTNAME), cygwin)
   shlib			= $(NAME)$(DLSUFFIX)
   # needed for /contrib modules, not sure why
   SHLIB_LINK		+= -lpgport
+  haslibarule   = yes
 endif
 
 ifeq ($(PORTNAME), win32)
   shlib			= lib$(NAME)$(DLSUFFIX)
+  haslibarule   = yes
 endif
 
 ifeq ($(PORTNAME), beos)
@@ -257,6 +259,7 @@ ifndef LORDER
 MK_NO_LORDER := true
 endif
 
+ifndef haslibarule
 lib$(NAME).a: $(OBJS)
 ifdef MK_NO_LORDER
 	$(LINK.static) $@ $^
@@ -264,6 +267,7 @@ else
 	$(LINK.static) $@ `$(LORDER) $^ | tsort`
 endif
 	$(RANLIB) $@
+endif #haslibarule
 
 ifeq ($(enable_shared), yes)