Remove pg_config_paths.h from libpq *.mak builds so later MinGW builds

will succeed.

diff --git a/src/bin/psql/bcc32.mak b/src/bin/psql/bcc32.mak
index 2fbe2a22782a7d1405700b93804501741cbc266c..46b07452a6a1aa7b80bd4e7c5b4818ca47088210 100644 (file)
--- a/src/bin/psql/bcc32.mak
+++ b/src/bin/psql/bcc32.mak
@@ -81,6 +81,7 @@ CLEAN :
    -@erase "$(INTDIR)\psql.ils"
    -@erase "$(INTDIR)\psql.ilf"
    -@erase "$(OUTDIR)\psql.exe"
+   -@erase "$(INTDIR)\pg_config_paths.h"
 
 pg_config_paths.h: win32.mak
    echo "#define PGBINDIR "">$@

diff --git a/src/bin/psql/win32.mak b/src/bin/psql/win32.mak
index 68dc0bb9cf69a80f87c487dbc3df564066b6f53d..3498a11c5d7c968c6964c76c3cc03d26b18af8a9 100644 (file)
--- a/src/bin/psql/win32.mak
+++ b/src/bin/psql/win32.mak
@@ -41,6 +41,7 @@ CLEAN :
    -@erase "$(INTDIR)\mbprint.obj"
    -@erase "$(INTDIR)\*psql.pch"
    -@erase "$(OUTDIR)\psql.exe"
+   -@erase "$(INTDIR)\pg_config_paths.h"
 
 pg_config_paths.h: win32.mak
    echo "#define PGBINDIR "">$@

diff --git a/src/interfaces/libpq/bcc32.mak b/src/interfaces/libpq/bcc32.mak
index e96272489eb7490b8b5821fd79a27852c3ec16fa..ac3e09cc38dcbc7c7fe28cbc8ce80d0c5c9528f0 100644 (file)
--- a/src/interfaces/libpq/bcc32.mak
+++ b/src/interfaces/libpq/bcc32.mak
@@ -124,6 +124,7 @@ CLEAN :
    -@erase "$(OUTDIR)\blibpqdll.lib"
    -@erase "$(OUTDIR)\blibpq.dll"
    -@erase "$(OUTDIR)\blibpq.tds"
+   -@erase "$(INTDIR)\pg_config_paths.h"
 
 config: ..\..\include\pg_config.h pthread.h pg_config_paths.h
 

diff --git a/src/interfaces/libpq/win32.mak b/src/interfaces/libpq/win32.mak
index bb79041790d55bbebfafd03bd183d652382ad786..2fbc76dd32e39e28a357529a12617b9a81847db1 100644 (file)
--- a/src/interfaces/libpq/win32.mak
+++ b/src/interfaces/libpq/win32.mak
@@ -75,7 +75,7 @@ CLEAN :
    -@erase "$(INTDIR)\wchar.obj"
    -@erase "$(INTDIR)\encnames.obj"
    -@erase "$(INTDIR)\pthread-win32.obj"
-
+   -@erase "$(INTDIR)\pg_config_paths.h"
 
 
 config: ..\..\include\pg_config.h pthread.h pg_config_paths.h