Fix HAVE_OPTRESET to be HAVE_INT_OPTRESET. Typos spotted by Lorne Sunley.

[postgresql] / src / Makefile.shlib

diff --git a/src/Makefile.shlib b/src/Makefile.shlib
index 4bd35655452bf549992bf5b712e2445798934a6b..002071e06cc1afe9b3a6bc8f14adadd20cd17ef1 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.86 2004/10/16 03:26:43 momjian Exp $
+#    $PostgreSQL: pgsql/src/Makefile.shlib,v 1.90 2004/11/20 21:13:04 tgl Exp $
 #
 #-------------------------------------------------------------------------
 
@@ -154,9 +154,15 @@ ifeq ($(PORTNAME), hpux)
     SHLIB_LINK         += `$(CC) $(LDFLAGS) -print-libgcc-file-name`
   endif
   ifeq ($(with_gnu_ld), yes)
-    LINK.shared                = $(CC) $(LDFLAGS) -shared -Wl,-h -Wl,$(soname) -Wl,+b -Wl,$(libdir)
+    LINK.shared                = $(CC) $(LDFLAGS) -shared -Wl,-h -Wl,$(soname)
   else
-    LINK.shared                = $(LD) +h $(soname) -b +b $(libdir)
+    # can't use the CC-syntax rpath pattern here
+    rpath =
+    ifeq ($(enable_rpath), yes)
+      LINK.shared      = $(LD) +h $(soname) -b +b $(rpathdir)
+    else
+      LINK.shared      = $(LD) +h $(soname) -b
+    endif
   endif
 endif
 
@@ -219,11 +225,13 @@ endif
 ifeq ($(PORTNAME), cygwin)
   shlib                        = $(NAME)$(DLSUFFIX)
   # needed for /contrib modules, not sure why
-  SHLIB_LINK           += -lpgport
+  SHLIB_LINK           += $(LIBS)
+  haslibarule   = yes
 endif
 
 ifeq ($(PORTNAME), win32)
   shlib                        = lib$(NAME)$(DLSUFFIX)
+  haslibarule   = yes
 endif
 
 ifeq ($(PORTNAME), beos)
@@ -249,14 +257,15 @@ endif # enable_shared
 
 all-lib: all-static-lib all-shared-lib
 
-all-static-lib: $(PTHREAD_H_WIN32) $(top_builddir)/src/port/pg_config_paths.h lib$(NAME).a
+all-static-lib: lib$(NAME).a
 
-all-shared-lib: $(PTHREAD_H_WIN32) $(top_builddir)/src/port/pg_config_paths.h $(shlib)
+all-shared-lib: $(shlib)
 
 ifndef LORDER
 MK_NO_LORDER := true
 endif
 
+ifndef haslibarule
 lib$(NAME).a: $(OBJS)
 ifdef MK_NO_LORDER
        $(LINK.static) $@ $^
@@ -264,6 +273,7 @@ else
        $(LINK.static) $@ `$(LORDER) $^ | tsort`
 endif
        $(RANLIB) $@
+endif #haslibarule
 
 ifeq ($(enable_shared), yes)