postgresql/ExternalPackage_postgresql.mk | 7 +++----
postgresql/ExternalProject_postgresql.mk | 3 ++-
2 files changed, 5 insertions(+), 5 deletions(-)
New commits:
commit f9735c65aaad195c1e6a4586d173ee30ad08e685
Author: Peter Foley <pefol...@verizon.net>
Date: Sun Oct 21 12:08:39 2012 -0400
fix postgresql on win
Change-Id: I15da34e09b74d9b97b64327ab46282c4f33e4118
diff --git a/postgresql/ExternalPackage_postgresql.mk
b/postgresql/ExternalPackage_postgresql.mk
index d86c105..ace19d0 100644
--- a/postgresql/ExternalPackage_postgresql.mk
+++ b/postgresql/ExternalPackage_postgresql.mk
@@ -16,10 +16,6 @@ $(eval $(call
gb_ExternalPackage_add_unpacked_files,postgresql,inc/postgresql,\
src/interfaces/libpq/libpq-fe.h \
))
-$(eval $(call gb_ExternalPackage_add_files,postgresql,inc/postgresql,\
- src/interfaces/libpq/libpq-flags.mk \
-))
-
ifeq ($(OS),WNT)
$(eval $(call gb_ExternalPackage_add_files,postgresql,lib,\
src/interfaces/libpq/libpq.lib \
@@ -28,5 +24,8 @@ else
$(eval $(call gb_ExternalPackage_add_files,postgresql,lib,\
src/interfaces/libpq/libpq.a \
))
+$(eval $(call gb_ExternalPackage_add_files,postgresql,inc/postgresql,\
+ src/interfaces/libpq/libpq-flags.mk \
+))
endif
# vim: set noet sw=4 ts=4:
diff --git a/postgresql/ExternalProject_postgresql.mk
b/postgresql/ExternalProject_postgresql.mk
index db1deb2..283b11b 100644
--- a/postgresql/ExternalProject_postgresql.mk
+++ b/postgresql/ExternalProject_postgresql.mk
@@ -19,7 +19,8 @@ ifeq ($(OS)$(COM),WNTMSC)
$(call gb_ExternalProject_get_state_target,postgresql,build) :
cd $(EXTERNAL_WORKDIR)/src \
- && nmake -f win32.mk USE_SSL=1 USE_LDAP=1 USE_MICROSOFT_LDAP=1 \
+ && unset MAKEFLAGS \
+ && nmake -f win32.mak USE_SSL=1 USE_LDAP=1 \
&& touch $@
else
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
