diff --git a/src/bin/psql/bcc32.mak b/src/bin/psql/bcc32.mak
index c07ace36154fa8a4badc45e692f86c9dc82fc770..2fbe2a22782a7d1405700b93804501741cbc266c 100644
--- a/src/bin/psql/bcc32.mak
+++ b/src/bin/psql/bcc32.mak
@@ -83,7 +83,15 @@ CLEAN :
 	-@erase "$(OUTDIR)\psql.exe"
 
 pg_config_paths.h: win32.mak
-	echo #define SYSCONFDIR "" >pg_config_paths.h
+	echo "#define PGBINDIR "">$@
+	echo "#define PGSHAREDIR "" >>$@
+	echo "#define SYSCONFDIR "" >>$@
+	echo "#define INCLUDEDIR "" >>$@
+	echo "#define PKGINCLUDEDIR "" >>$@
+	echo "#define INCLUDEDIRSERVER "" >>$@
+	echo "#define LIBDIR "" >>$@
+	echo "#define PKGLIBDIR "" >>$@
+	echo "#define LOCALEDIR "" >>$@
 
 "$(OUTDIR)" :
     if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
diff --git a/src/bin/psql/win32.mak b/src/bin/psql/win32.mak
index ab43882dd8ebbb500e1ea6350df00a257bf9e211..68dc0bb9cf69a80f87c487dbc3df564066b6f53d 100644
--- a/src/bin/psql/win32.mak
+++ b/src/bin/psql/win32.mak
@@ -43,7 +43,15 @@ CLEAN :
 	-@erase "$(OUTDIR)\psql.exe"
 
 pg_config_paths.h: win32.mak
-	echo #define SYSCONFDIR "" >pg_config_paths.h
+	echo "#define PGBINDIR "">$@
+	echo "#define PGSHAREDIR "" >>$@
+	echo "#define SYSCONFDIR "" >>$@
+	echo "#define INCLUDEDIR "" >>$@
+	echo "#define PKGINCLUDEDIR "" >>$@
+	echo "#define INCLUDEDIRSERVER "" >>$@
+	echo "#define LIBDIR "" >>$@
+	echo "#define PKGLIBDIR "" >>$@
+	echo "#define LOCALEDIR "" >>$@
 
 "$(OUTDIR)" :
     if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"