Realign libpq and psql for need for path.c under Win32 VC and BCC.

diff --git a/src/bin/psql/bcc32.mak b/src/bin/psql/bcc32.mak
index fa0c9ef1f1d81ce50f99ab3ccfb8531517986891..c07ace36154fa8a4badc45e692f86c9dc82fc770 100644 (file)
--- a/src/bin/psql/bcc32.mak
+++ b/src/bin/psql/bcc32.mak
@@ -53,7 +53,7 @@ REFDOCDIR=../../../doc/src/sgml/ref
 .c.obj:
        $(CPP) -o"$(INTDIR)\$&" $(CPP_PROJ) $<
 
-ALL : "sql_help.h" "$(OUTDIR)\psql.exe"
+ALL : sql_help.h pg_config_paths.h "$(OUTDIR)\psql.exe"
 
 CLEAN :
        -@erase "$(INTDIR)\command.obj"
@@ -82,6 +82,9 @@ CLEAN :
        -@erase "$(INTDIR)\psql.ilf"
        -@erase "$(OUTDIR)\psql.exe"
 
+pg_config_paths.h: win32.mak
+       echo #define SYSCONFDIR "" >pg_config_paths.h
+
 "$(OUTDIR)" :
     if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
 

diff --git a/src/bin/psql/win32.mak b/src/bin/psql/win32.mak
index 60f57552f123381a2bb98a63284a73954d0fff9c..ab43882dd8ebbb500e1ea6350df00a257bf9e211 100644 (file)
--- a/src/bin/psql/win32.mak
+++ b/src/bin/psql/win32.mak
@@ -16,7 +16,7 @@ REFDOCDIR= ../../../doc/src/sgml/ref
 OutDir=.\Release
 # End Custom Macros
 
-ALL : sql_help.h "$(OUTDIR)\psql.exe"
+ALL : sql_help.h pg_config_paths.h "$(OUTDIR)\psql.exe"
 
 CLEAN :
        -@erase "$(INTDIR)\command.obj"
@@ -42,6 +42,9 @@ CLEAN :
        -@erase "$(INTDIR)\*psql.pch"
        -@erase "$(OUTDIR)\psql.exe"
 
+pg_config_paths.h: win32.mak
+       echo #define SYSCONFDIR "" >pg_config_paths.h
+
 "$(OUTDIR)" :
     if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
 

diff --git a/src/interfaces/libpq/bcc32.mak b/src/interfaces/libpq/bcc32.mak
index 81aae097d9790191bd32fa336799b1e4cab71ee8..e96272489eb7490b8b5821fd79a27852c3ec16fa 100644 (file)
--- a/src/interfaces/libpq/bcc32.mak
+++ b/src/interfaces/libpq/bcc32.mak
@@ -67,7 +67,6 @@ LIB32_OBJS= \
        "$(INTDIR)\thread.obj" \
        "$(INTDIR)\inet_aton.obj" \
        "$(INTDIR)\crypt.obj" \
-       "$(INTDIR)\path.obj" \
        "$(INTDIR)\noblock.obj" \
        "$(INTDIR)\pgstrcasecmp.obj" \
        "$(INTDIR)\dllist.obj" \
@@ -93,13 +92,6 @@ RSC_PROJ=-l 0x409 -i$(BCB)\include -fo"$(INTDIR)\libpq.res"
 LINK32=ilink32.exe
 LINK32_FLAGS = -Gn -L$(BCB)\lib;$(INTDIR); -x -Tpd -v
 LINK32_OBJS= "$(INTDIR)\libpqdll.obj"
-       
-# ---------------------------------------------------------------------------
-
-.path.obj = $(INTDIR)
-.path.c = .;..\..\port;..\..\backend\libpq;..\..\backend\lib;..\..\backend\utils\mb
-
-# ---------------------------------------------------------------------------
 
 ALL: config "$(OUTDIR)" "$(OUTDIR)\blibpq.dll" "$(OUTDIR)\blibpq.lib"
 
@@ -108,7 +100,6 @@ CLEAN :
        -@erase "$(INTDIR)\thread.obj"
        -@erase "$(INTDIR)\inet_aton.obj"
        -@erase "$(INTDIR)\crypt.obj"
-       -@erase "$(INTDIR)\path.obj"
        -@erase "$(INTDIR)\dllist.obj"
        -@erase "$(INTDIR)\md5.obj"
        -@erase "$(INTDIR)\ip.obj"