diff --git a/src/Makefile.shlib b/src/Makefile.shlib
index 6653b270e91..002071e06cc 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.89 2004/11/19 21:27:42 tgl Exp $
+#    $PostgreSQL: pgsql/src/Makefile.shlib,v 1.90 2004/11/20 21:13:04 tgl Exp $
 #
 #-------------------------------------------------------------------------
 
@@ -257,9 +257,9 @@ 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
diff --git a/src/interfaces/ecpg/ecpglib/Makefile b/src/interfaces/ecpg/ecpglib/Makefile
index 13cd6207aca..235eece3b10 100644
--- a/src/interfaces/ecpg/ecpglib/Makefile
+++ b/src/interfaces/ecpg/ecpglib/Makefile
@@ -4,7 +4,7 @@
 #
 # Copyright (c) 1994, Regents of the University of California
 #
-# $PostgreSQL: pgsql/src/interfaces/ecpg/ecpglib/Makefile,v 1.28 2004/10/12 04:48:35 neilc Exp $
+# $PostgreSQL: pgsql/src/interfaces/ecpg/ecpglib/Makefile,v 1.29 2004/11/20 21:13:05 tgl Exp $
 #
 #-------------------------------------------------------------------------
 
@@ -30,7 +30,7 @@ OBJS= execute.o typename.o descriptor.o data.o error.o prepare.o memory.o \
 SHLIB_LINK = -L../pgtypeslib -lpgtypes $(libpq) \
 	$(filter -lintl -lssl -lcrypto -lkrb5 -lcrypt -lm, $(LIBS)) $(PTHREAD_LIBS)
 
-all: $(top_builddir)/src/port/pg_config_paths.h all-lib
+all: all-lib
 
 # Shared library stuff
 include $(top_srcdir)/src/Makefile.shlib
@@ -46,8 +46,10 @@ path.c: % : $(top_srcdir)/src/port/%
 exec.c: % : $(top_srcdir)/src/port/%
 	rm -f $@ && $(LN_S) $< .
 
-$(top_srcdir)/src/port/pg_config_paths.h:
-	$(MAKE) -C $(top_srcdir)/src/port pg_config_paths.h
+path.o: path.c $(top_builddir)/src/port/pg_config_paths.h
+
+$(top_builddir)/src/port/pg_config_paths.h:
+	$(MAKE) -C $(top_builddir)/src/port pg_config_paths.h
 
 install: all installdirs install-lib
 
diff --git a/src/interfaces/libpq/Makefile b/src/interfaces/libpq/Makefile
index c8a57f898d6..56845318e81 100644
--- a/src/interfaces/libpq/Makefile
+++ b/src/interfaces/libpq/Makefile
@@ -5,7 +5,7 @@
 # Portions Copyright (c) 1996-2004, PostgreSQL Global Development Group
 # Portions Copyright (c) 1994, Regents of the University of California
 #
-# $PostgreSQL: pgsql/src/interfaces/libpq/Makefile,v 1.121 2004/11/17 17:46:19 tgl Exp $
+# $PostgreSQL: pgsql/src/interfaces/libpq/Makefile,v 1.122 2004/11/20 21:13:06 tgl Exp $
 #
 #-------------------------------------------------------------------------
 
@@ -37,13 +37,15 @@ endif
 
 ifeq ($(PORTNAME), win32)
 OBJS += win32.o libpqrc.o
-libpqrc.o : libpq.rc
-	windres -i libpq.rc -o libpqrc.o
 DLL_DEFFILE=libpqdll.def
+
+libpqrc.o: libpq.rc
+	windres -i libpq.rc -o libpqrc.o
+
 ifeq ($(enable_thread_safety), yes)
 # This doesn't work yet because configure test fails.  2004-06-19
 OBJS += pthread-win32.o
-PTHREAD_H_WIN32 = yes
+PTHREAD_H_WIN32 = pthread.h
 endif
 endif
 
@@ -57,7 +59,7 @@ SHLIB_LINK += -lwsock32 -lws2_32 $(filter -leay32 -lssleay32, $(LIBS))
 endif
 
 
-all: $(PTHREAD_H_WIN32) $(top_builddir)/src/port/pg_config_paths.h def-files all-lib
+all: $(PTHREAD_H_WIN32) def-files all-lib
 
 # Shared library stuff
 include $(top_srcdir)/src/Makefile.shlib
@@ -118,12 +120,14 @@ $(srcdir)/blibpqdll.def: exports.txt
 
 
 ifneq ($(PTHREAD_H_WIN32), "")
-pthread.h : % : $(top_srcdir)/src/interfaces/libpq/pthread.h.win
+pthread.h: $(top_srcdir)/src/interfaces/libpq/pthread.h.win
 	rm -f $@ && $(LN_S) $< .
 endif
 
-$(top_srcdir)/src/port/pg_config_paths.h:
-	$(MAKE) -C $(top_srcdir)/src/port pg_config_paths.h
+fe-connect.o: fe-connect.c $(top_builddir)/src/port/pg_config_paths.h
+
+$(top_builddir)/src/port/pg_config_paths.h:
+	$(MAKE) -C $(top_builddir)/src/port pg_config_paths.h
 
 install: all installdirs install-lib
 	$(INSTALL_DATA) $(srcdir)/libpq-fe.h $(DESTDIR)$(includedir)