summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFridrich Štrba <fridrich.strba@bluewin.ch>2011-12-11 12:24:38 +0100
committerFridrich Štrba <fridrich.strba@bluewin.ch>2011-12-11 12:24:38 +0100
commitbee80a2a5762ab483b64b6d9b38d39ed3ffeca1f (patch)
tree235108a49eb2fe5329839846cddea6829a7c9132
parent95a0d27887934ab60af321ce83655238a29df981 (diff)
Make internal pgsql build on mac and make it default for release
-rw-r--r--distro-configs/LibreOfficeMacOSX.conf2
-rw-r--r--postgresql/makefile.mk2
2 files changed, 3 insertions, 1 deletions
diff --git a/distro-configs/LibreOfficeMacOSX.conf b/distro-configs/LibreOfficeMacOSX.conf
index 3d22aa919449..59ea95bde9ba 100644
--- a/distro-configs/LibreOfficeMacOSX.conf
+++ b/distro-configs/LibreOfficeMacOSX.conf
@@ -10,4 +10,6 @@
--enable-ext-scripting-beanshell
--enable-ext-scripting-javascript
--enable-ext-nlpsolver
+--enable-ext-postgresql-sdbc
--enable-extension-integration
+--without-system-postgresql
diff --git a/postgresql/makefile.mk b/postgresql/makefile.mk
index 2aae5db73e70..29797791b254 100644
--- a/postgresql/makefile.mk
+++ b/postgresql/makefile.mk
@@ -63,7 +63,7 @@ BUILD_DIR=src/interfaces/libpq
# --sysconfdir: config files. Ideally, we would like that to be "the same as the platform default",
# but that's quite some guessing work.
CONFIGURE_ACTION = ./configure --without-readline --disable-shared
-BUILD_ACTION = make -j$(GMAKE_MODULE_PARALLELISM)
+BUILD_ACTION = make -j$(GMAKE_MODULE_PARALLELISM) all-static-lib
.ENDIF
# --- Targets ------------------------------------------------------