[Libreoffice-commits] .: postgresql/makefile.mk postgresql/postgresql-9.1.1.patch postgresql/prj

[Fridrich Strba]

 postgresql/makefile.mk            |    9 +++------
 postgresql/postgresql-9.1.1.patch |    6 +++---
 postgresql/prj/d.lst              |    2 +-
 3 files changed, 7 insertions(+), 10 deletions(-)

New commits:
commit 6e407a58872c0bef1be1cdf825cffb7902cb5699
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date:   Fri Dec 9 13:05:56 2011 +0100

    Fix Windows build and delivery of libpq

diff --git a/postgresql/makefile.mk b/postgresql/makefile.mk
index 6e85025..2aae5db 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 cafb4a3..54ac388 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 88c3a86..a96f3b1 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\