summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFridrich Štrba <fridrich.strba@bluewin.ch>2011-12-09 13:05:56 +0100
committerFridrich Štrba <fridrich.strba@bluewin.ch>2011-12-09 13:06:36 +0100
commit6e407a58872c0bef1be1cdf825cffb7902cb5699 (patch)
tree4f9e538aa153f19cbf4b7bf58eb7abf8571bb02a
parent0670d4652dab1986412f4e9d3c9f36ba2e34db64 (diff)
Fix Windows build and delivery of libpq
-rw-r--r--postgresql/makefile.mk9
-rw-r--r--postgresql/postgresql-9.1.1.patch6
-rw-r--r--postgresql/prj/d.lst2
3 files changed, 7 insertions, 10 deletions
diff --git a/postgresql/makefile.mk b/postgresql/makefile.mk
index 6e85025d49ce..2aae5db73e70 100644
--- a/postgresql/makefile.mk
+++ b/postgresql/makefile.mk
@@ -47,7 +47,7 @@ PATCH_FILES=\
.ENDIF
-.IF "$(GUI)$(COM)"=="WNTGCC"
+.IF "$(GUI)$(COM)"=="WNTMSC"
CONFIGURE_DIR=.
BUILD_DIR=src
@@ -62,11 +62,8 @@ BUILD_DIR=src/interfaces/libpq
# (which we don't install anyway for now...)
# --sysconfdir: config files. Ideally, we would like that to be "the same as the platform default",
# but that's quite some guessing work.
-.IF "$(VERBOSE)"==""
-MAKE_SILENT=-s
-.ENDIF
-CONFIGURE_ACTION = ./configure --without-readline
-BUILD_ACTION = make $(MAKE_SILENT) -j$(GMAKE_MODULE_PARALLELISM) all-static-lib
+CONFIGURE_ACTION = ./configure --without-readline --disable-shared
+BUILD_ACTION = make -j$(GMAKE_MODULE_PARALLELISM)
.ENDIF
# --- Targets ------------------------------------------------------
diff --git a/postgresql/postgresql-9.1.1.patch b/postgresql/postgresql-9.1.1.patch
index cafb4a308a6b..54ac388dbc24 100644
--- a/postgresql/postgresql-9.1.1.patch
+++ b/postgresql/postgresql-9.1.1.patch
@@ -47,9 +47,9 @@
-CPP_OBJS=.\Release/
-!ENDIF
-
-+OUTDIR=$(OUTDIR)/lib
-+INTDIR=$(OUTDIR)/lib
-+CPP_OBJS=$(OUTDIR)/slo/
++OUTDIR=.
++INTDIR=.
++CPP_OBJS=./
-ALL : config "$(OUTDIR)\$(OUTFILENAME).lib" "$(OUTDIR)\$(OUTFILENAME).dll"
+ALL : config "$(OUTDIR)\$(OUTFILENAME).lib"
diff --git a/postgresql/prj/d.lst b/postgresql/prj/d.lst
index 88c3a86cb8b9..a96f3b1c42f6 100644
--- a/postgresql/prj/d.lst
+++ b/postgresql/prj/d.lst
@@ -3,5 +3,5 @@ mkdir: %_DEST%\inc\postgresql
..\%__SRC%\misc\build\postgresql-*\src\include\postgres_ext.h %_DEST%\inc\postgresql\
..\%__SRC%\misc\build\postgresql-*\src\interfaces\libpq\libpq-fe.h %_DEST%\inc\postgresql\
..\%__SRC%\misc\build\postgresql-*\src\interfaces\libpq\libpq.a %_DEST%\lib\
-..\%__SRC%\lib\*.lib %_DEST%\lib\*.lib
+..\%__SRC%\misc\build\postgresql-*\src\interfaces\libpq\libpq.lib %_DEST%\lib\