summaryrefslogtreecommitdiff
path: root/external/openldap/ExternalProject_openldap.mk
diff options
context:
space:
mode:
authorMichael Stahl <mstahl@redhat.com>2013-11-13 17:08:03 +0100
committerMichael Stahl <mstahl@redhat.com>2013-11-14 11:27:38 +0000
commitcca8c8cf79e0d9bcfb8798de3948aa446317b08e (patch)
tree00f58d7fc35e8ba68b36ad99ac3fe117a04d0360 /external/openldap/ExternalProject_openldap.mk
parent6c5557c60f97778fd732c01f054553356ce7f258 (diff)
nss: upgrade to 3.15.3
- from nss_macosx.patch drop nmedit hunk (removed upstream) - adapt include and lib paths to changed tarball directory layout Change-Id: Ia5dcce8dfd9d10e7e4ba689eefa9f39a51596dfe Reviewed-on: https://gerrit.libreoffice.org/6670 Tested-by: LibreOffice gerrit bot <gerrit@libreoffice.org> Reviewed-by: Michael Stahl <mstahl@redhat.com>
Diffstat (limited to 'external/openldap/ExternalProject_openldap.mk')
-rw-r--r--external/openldap/ExternalProject_openldap.mk6
1 files changed, 3 insertions, 3 deletions
diff --git a/external/openldap/ExternalProject_openldap.mk b/external/openldap/ExternalProject_openldap.mk
index 36c844c0b6d5..10de51fbfe42 100644
--- a/external/openldap/ExternalProject_openldap.mk
+++ b/external/openldap/ExternalProject_openldap.mk
@@ -32,9 +32,9 @@ $(call gb_ExternalProject_get_state_target,openldap,build) :
$(if $(filter YES,$(SYSTEM_NSS)), \
CPPFLAGS="$(NSS_CFLAGS)" CFLAGS="$(NSS_CFLAGS)" LDFLAGS="$(NSS_LIBS)" \
, \
- CPPFLAGS="-I$(call gb_UnpackedTarball_get_dir,nss)/mozilla/dist/public/nss -I$(call gb_UnpackedTarball_get_dir,nss)/mozilla/dist/out/include" \
- CFLAGS="-I$(call gb_UnpackedTarball_get_dir,nss)/mozilla/dist/public/nss -I$(call gb_UnpackedTarball_get_dir,nss)/mozilla/dist/out/include" \
- LDFLAGS="-L$(call gb_UnpackedTarball_get_dir,nss)/mozilla/dist/out/lib $(if $(filter AIX,$(OS)),-Wl$(COMMA)-brtl)" \
+ CPPFLAGS="-I$(call gb_UnpackedTarball_get_dir,nss)/dist/public/nss -I$(call gb_UnpackedTarball_get_dir,nss)/dist/out/include" \
+ CFLAGS="-I$(call gb_UnpackedTarball_get_dir,nss)/dist/public/nss -I$(call gb_UnpackedTarball_get_dir,nss)/dist/out/include" \
+ LDFLAGS="-L$(call gb_UnpackedTarball_get_dir,nss)/dist/out/lib $(if $(filter AIX,$(OS)),-Wl$(COMMA)-brtl)" \
) \
&& MAKEFLAGS= && $(MAKE) \
)