[Libreoffice-commits] .: 3 commits - configure.in postgresql/makefile.mk

[Lionel Elie Mamane]

 configure.in           |    2 +-
 postgresql/makefile.mk |   12 ++++--------
 2 files changed, 5 insertions(+), 9 deletions(-)

New commits:
commit c9c31ee37c75d02a8f66f68df88b60394d80cae9
Author: Lionel Elie Mamane <lionel at mamane.lu>
Date:   Sat Dec 3 09:33:21 2011 +0100

    postgresql: do not make headers we do not need

diff --git a/postgresql/makefile.mk b/postgresql/makefile.mk
index 457894e..6d474e1 100644
--- a/postgresql/makefile.mk
+++ b/postgresql/makefile.mk
@@ -64,9 +64,10 @@ BUILD_ACTION = \
 			  --bindir=/usr/lib/postgresql/$(MAJOR_VER)/bin \
 			  --libdir=/usr/lib/ \
 			  --includedir=/usr/include/postgresql/ \
-	 && make -C src/backend ../../src/include/utils/errcodes.h ../../src/include/utils/fmgroids.h \
-	 && make -C src/include DESTDIR="../../../../../" install \
-	 && make $(MAKE_SILENT) -j$(GMAKE_MODULE_PARALLELISM) -C src/interfaces/libpq DESTDIR="../../../../../../" install
+	 && DESTDIR="$(SRC_ROOT)/$(PRJNAME)/$(INPATH)/" \
+	 && export DESTDIR \
+	 && make $(MAKE_SILENT) -j$(GMAKE_MODULE_PARALLELISM) -C src/interfaces/libpq install \
+	 && ./config/install-sh -c -m 644 src/include/postgres_ext.h "$${{DESTDIR}}/usr/include/postgresql/"
 
 # --- Targets ------------------------------------------------------
 
commit a33aaa4ba0452adb2943912dd356ea746d286a6e
Author: Lionel Elie Mamane <lionel at mamane.lu>
Date:   Sat Dec 3 09:01:48 2011 +0100

    Oups... set_soeven does not like literal "@" in values

diff --git a/configure.in b/configure.in
index 890ec7b..5b2a01c 100644
--- a/configure.in
+++ b/configure.in
@@ -5429,7 +5429,7 @@ if test "x$enable_ext_postgresql_sdbc" = "xyes" -a "x$enable_extension_integrati
             SYSTEM_POSTGRESQL=NO
             AC_MSG_RESULT([internal])
             POSTGRESQL_LIB=""
-            POSTGRESQL_INC="@@OVERRIDE_ME@@"
+            POSTGRESQL_INC="%OVERRIDE_ME%"
             BUILD_TYPE="$BUILD_TYPE POSTGRESQL"
         fi
     fi
commit 0cac9d5238eff7197a93d543daa55a84fa204d78
Author: Lionel Elie Mamane <lionel at mamane.lu>
Date:   Sat Dec 3 08:57:40 2011 +0100

    remove n/a comments (came from a copy/paste)

diff --git a/postgresql/makefile.mk b/postgresql/makefile.mk
index c47721b..457894e 100644
--- a/postgresql/makefile.mk
+++ b/postgresql/makefile.mk
@@ -42,11 +42,6 @@ MAJOR_VER=9.1
 TARFILE_NAME=$(EXT_PROJECT_NAME)
 TARFILE_MD5=061a9f17323117c9358ed60f33ecff78
 
-
-# distro-specific builds want to link against a particular mysql library
-# then they do not require mysql-devel package at runtime
-# So put mysql-connector-cpp/driver/nativeapi/binding_config.h into separate patch
-# and enable/disable MYSQLCLIENT_STATIC_BINDING according to the used mysql library
 .IF "$(SYSTEM_POSTGRESQL)" == "YES"
 @all:
     @echo "Using system postgresql..."