diff --git a/src/interfaces/libpgtcl/Makefile.in b/src/interfaces/libpgtcl/Makefile.in
index d29e91502466491b5393328cc7d8e30acc4a8325..cb2057594072dfd0a9bf1e5d6041a58260d4e1e8 100644
--- a/src/interfaces/libpgtcl/Makefile.in
+++ b/src/interfaces/libpgtcl/Makefile.in
@@ -7,7 +7,7 @@
 #
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/interfaces/libpgtcl/Attic/Makefile.in,v 1.24 1998/10/09 04:22:46 momjian Exp $
+#    $Header: /cvsroot/pgsql/src/interfaces/libpgtcl/Attic/Makefile.in,v 1.25 1998/10/09 04:50:06 momjian Exp $
 #
 #-------------------------------------------------------------------------
 
@@ -54,7 +54,7 @@ ifeq ($(PORTNAME), bsdi)
     ifeq ($(DLSUFFIX), .so)
       install-shlib-dep	:= install-shlib
       shlib		:= libpgtcl.so
-      LDFLAGS_SL	+= -O -shared
+      LDFLAGS_SL	+= -shared
       CFLAGS		+= $(CFLAGS_SL)
     endif
     ifeq ($(DLSUFFIX), .o)
diff --git a/src/interfaces/libpq/Makefile.in b/src/interfaces/libpq/Makefile.in
index c5c002426ae5bbb8268b528e7bacab398b05abb5..77997a849a7578ef619c21b9918be04d1c8ce80d 100644
--- a/src/interfaces/libpq/Makefile.in
+++ b/src/interfaces/libpq/Makefile.in
@@ -7,7 +7,7 @@
 #
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/interfaces/libpq/Attic/Makefile.in,v 1.32 1998/10/09 04:22:48 momjian Exp $
+#    $Header: /cvsroot/pgsql/src/interfaces/libpq/Attic/Makefile.in,v 1.33 1998/10/09 04:50:08 momjian Exp $
 #
 #-------------------------------------------------------------------------
 
@@ -61,13 +61,13 @@ ifeq ($(PORTNAME), bsdi)
     ifeq ($(DLSUFFIX), .so)
       install-shlib-dep := install-shlib
       shlib		:= libpq.so.$(SO_MAJOR_VERSION).$(SO_MINOR_VERSION)
-      LDFLAGS_SL	+= -O -shared
+      LDFLAGS_SL	+= -shared
       CFLAGS		+= $(CFLAGS_SL)
     endif
     ifeq ($(DLSUFFIX), .o)
       install-shlib-dep	:= install-shlib
       shlib		:= libpq.o.$(SO_MAJOR_VERSION).$(SO_MINOR_VERSION)
-      LD		:=shlicc
+      LD		:= shlicc
       LDFLAGS_SL 	+= -O -r
       CFLAGS		+= $(CFLAGS_SL)
     endif
diff --git a/src/makefiles/Makefile.bsdi b/src/makefiles/Makefile.bsdi
index f2c54d8a7916c86fd9030ca9b6d998aab17906c0..88fe307e1569a257de2bedafa1b3dc1abfc14054 100644
--- a/src/makefiles/Makefile.bsdi
+++ b/src/makefiles/Makefile.bsdi
@@ -1,5 +1,4 @@
 # for bsdi 4.0 ELF
 # if we defined .so in template/bsdi_4.0
 %.so: %.o
-	$(CC) -shared -o $@ $<
-
+	$(LD) -shared -o $@ $<
diff --git a/src/pl/plpgsql/src/Makefile.in b/src/pl/plpgsql/src/Makefile.in
index 2ee532484ceb3040d2388eb2d759b08468f5820b..cd8bb815d7bf31a4aad6623bc23ca9f879214199 100644
--- a/src/pl/plpgsql/src/Makefile.in
+++ b/src/pl/plpgsql/src/Makefile.in
@@ -4,7 +4,7 @@
 #    Makefile for the plpgsql shared object
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/pl/plpgsql/src/Attic/Makefile.in,v 1.3 1998/10/09 04:22:49 momjian Exp $
+#    $Header: /cvsroot/pgsql/src/pl/plpgsql/src/Attic/Makefile.in,v 1.4 1998/10/09 04:50:12 momjian Exp $
 #
 #-------------------------------------------------------------------------
 
@@ -43,7 +43,7 @@ endif
 ifeq ($(PORTNAME), bsdi)
   ifdef BSD_SHLIB
     ifeq ($(DLSUFFIX), .so)
-      LDFLAGS_SL	+= -O -shared
+      LDFLAGS_SL	+= -shared
       CFLAGS		+= $(CFLAGS_SL)
     endif
     ifeq ($(DLSUFFIX), .o)