diff options
| author | Peter Foley <pefoley2@verizon.net> | 2012-10-21 12:08:39 -0400 |
|---|---|---|
| committer | Peter Foley <pefoley2@verizon.net> | 2012-10-21 12:11:02 -0400 |
| commit | f9735c65aaad195c1e6a4586d173ee30ad08e685 (patch) | |
| tree | e34dfe03befa014156572774199eb5262536727d /postgresql | |
| parent | 5e56827888797f80d35ed71536b81b9854bb5ce7 (diff) | |
fix postgresql on win
Change-Id: I15da34e09b74d9b97b64327ab46282c4f33e4118
Diffstat (limited to 'postgresql')
| -rw-r--r-- | postgresql/ExternalPackage_postgresql.mk | 7 | ||||
| -rw-r--r-- | postgresql/ExternalProject_postgresql.mk | 3 |
2 files changed, 5 insertions, 5 deletions
diff --git a/postgresql/ExternalPackage_postgresql.mk b/postgresql/ExternalPackage_postgresql.mk index d86c1059ade2..ace19d048e79 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 db1deb2722f0..283b11bf128d 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 |