diff --git a/src/interfaces/ecpg/lib/Makefile.in b/src/interfaces/ecpg/lib/Makefile.in
index fa7849b3c2ac255beb15e7fd6bae4ffea0133c99..642ec1be8bb260eee4a85d6e0baf9ea3e372d909 100644
--- a/src/interfaces/ecpg/lib/Makefile.in
+++ b/src/interfaces/ecpg/lib/Makefile.in
@@ -49,7 +49,7 @@ all: libecpg.a $(shlib)
 
 $(shlib): ecpglib.sho typename.sho
 	$(LD) $(LDFLAGS_SL) -o $@ ecpglib.sho typename.sho
-	ln -sf $@ libecpg.so
+	$(LN_S) -f $@ libecpg.so
 
 clean:
 	rm -f *.o *.sho *.a core a.out *~ $(shlib) libecpg.so
@@ -61,7 +61,7 @@ install: libecpg.a $(shlib) $(install-shlib-dep)
 
 install-shlib:
 	$(INSTALL) $(INSTLOPTS) $(shlib) $(LIBDIR)
-	ln -sf $(shlib) $(LIBDIR)/libecpg.so
+	$(LN_S) -f $(shlib) $(LIBDIR)/libecpg.so
 
 uninstall::
 	rm -f $(LIBDIR)/libecpg.a $(LIBDIR)/$(shlib)
diff --git a/src/interfaces/libpgtcl/Makefile.in b/src/interfaces/libpgtcl/Makefile.in
index c2dc435ec5b3ad5c51f463b32b4cb4a630cdb2c9..f77db96fdc83713cfbec3018c50503a3508b6813 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.21 1998/09/10 04:59:00 momjian Exp $
+#    $Header: /cvsroot/pgsql/src/interfaces/libpgtcl/Attic/Makefile.in,v 1.22 1998/10/07 06:50:26 thomas Exp $
 #
 #-------------------------------------------------------------------------
 
@@ -111,7 +111,7 @@ endif
 
 $(shlib): $(OBJS)
 	$(LD) $(LDFLAGS_SL) -o $@ $(OBJS) $(LIBPQ)
-	ln -sf $@ libpgtcl.so
+	$(LN_S) -f $@ libpgtcl.so
 
 .PHONY: beforeinstall-headers install-headers
 .PHONY: install install-libpgtcl
@@ -130,7 +130,7 @@ install-libpgtcl: libpgtcl.a
 install-shlib: $(shlib)
 	$(INSTALL) $(INSTL_SHLIB_OPTS) $(shlib) \
 		$(LIBDIR)/$(shlib)
-	ln -sf $(shlib) $(LIBDIR)/libpgtcl.so
+	$(LN_S) -f $(shlib) $(LIBDIR)/libpgtcl.so
 
 .PHONY: clean
 clean: 
diff --git a/src/interfaces/libpq++/Makefile.in b/src/interfaces/libpq++/Makefile.in
index 811d743ae9496d21409938bfa8c79aa1ffdceb5c..f05638d19503e65e097a74dfb8a743e8ab06c4b5 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.2 1998/09/13 04:00:41 momjian Exp $
+#    $Header: /cvsroot/pgsql/src/interfaces/libpq++/Attic/Makefile.in,v 1.3 1998/10/07 06:50:37 thomas Exp $
 #
 #-------------------------------------------------------------------------
 
@@ -145,7 +145,7 @@ install-$(LIBNAME): $(LIBNAME).a beforeinstall-lib
 install-shlib: $(SHLIBNAME) beforeinstall-lib
 	$(INSTALL) $(INSTL_SHLIB_OPTS) $(SHLIB) $(LIBDIR)/$(SHLIB)
 	rm -f $(LIBDIR)/libpq++.so
-	ln -sf $(SHLIB) $(LIBDIR)/libpq++.so
+	$(LN_S) -f $(SHLIB) $(LIBDIR)/libpq++.so
 
 
 doc:
diff --git a/src/interfaces/libpq/Makefile.in b/src/interfaces/libpq/Makefile.in
index a97d74417256555439a6461df5d5e6c98950abfa..fe4ed4090026b7b4cff13caa0bb86efeb8edca43 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.29 1998/10/06 14:22:12 tgl Exp $
+#    $Header: /cvsroot/pgsql/src/interfaces/libpq/Attic/Makefile.in,v 1.30 1998/10/07 06:50:33 thomas Exp $
 #
 #-------------------------------------------------------------------------
 
@@ -116,19 +116,19 @@ endif
 # We need to compile this with special options for shared libs,
 # so we can't use the object in $(SRCDIR)/backend
 dllist.c:	$(SRCDIR)/backend/lib/dllist.c
-	-ln -s $(SRCDIR)/backend/lib/dllist.c .
+	-$(LN_S) $(SRCDIR)/backend/lib/dllist.c .
 
 ifdef MULTIBYTE
 # We need to compile this with special options for shared libs,
 # so we can't use the object in $(SRCDIR)/backend
 common.c: $(SRCDIR)/backend/utils/mb/common.c
-	-ln -s $(SRCDIR)/backend/utils/mb/common.c .
+	-$(LN_S) $(SRCDIR)/backend/utils/mb/common.c .
 
 wchar.c: $(SRCDIR)/backend/utils/mb/wchar.c
-	-ln -s $(SRCDIR)/backend/utils/mb/wchar.c .
+	-$(LN_S) $(SRCDIR)/backend/utils/mb/wchar.c .
 
 conv.c: $(SRCDIR)/backend/utils/mb/conv.c
-	-ln -s $(SRCDIR)/backend/utils/mb/conv.c .
+	-$(LN_S) $(SRCDIR)/backend/utils/mb/conv.c .
 endif
 
 # The following rules cause dependencies in the backend directory to 
@@ -141,7 +141,7 @@ $(SRCDIR)/backend/fmgr.h:
 
 $(shlib): $(OBJS)
 	$(LD) $(LDFLAGS_SL) -o $@ $(OBJS) 
-	ln -sf $@ libpq.so
+	$(LN_S) -f $@ libpq.so
 
 
 .PHONY: beforeinstall-headers install-headers
@@ -216,7 +216,7 @@ install-libpq: libpq.a
 install-shlib: $(shlib)
 	$(INSTALL) $(INSTL_SHLIB_OPTS) $(shlib) $(LIBDIR)/$(shlib)
 	rm -f $(LIBDIR)/libpq.so
-	ln -s $(shlib) $(LIBDIR)/libpq.so
+	$(LN_S) $(shlib) $(LIBDIR)/libpq.so
 
 depend dep:
 	$(CC) -MM $(CFLAGS) *.c >depend