summaryrefslogtreecommitdiff
path: root/openldap
diff options
context:
space:
mode:
authorPeter Foley <pefoley2@verizon.net>2013-01-01 09:39:36 -0500
committerLuboš Luňák <l.lunak@suse.cz>2013-01-02 16:21:23 +0000
commitc003d25d24786073229d0f8e545b2863c27fa282 (patch)
treec79f8c7f34a51ae34d7599076dccb92a5955516d /openldap
parentdc277bc6a1c357fe725db2c567d3e1cf16fb7806 (diff)
convert nss to gbuild
Change-Id: I59edc4c437abccc201823d97f1cbec230d273b05 Reviewed-on: https://gerrit.libreoffice.org/1529 Reviewed-by: Luboš Luňák <l.lunak@suse.cz> Tested-by: Luboš Luňák <l.lunak@suse.cz>
Diffstat (limited to 'openldap')
-rw-r--r--openldap/ExternalProject_openldap.mk4
1 files changed, 2 insertions, 2 deletions
diff --git a/openldap/ExternalProject_openldap.mk b/openldap/ExternalProject_openldap.mk
index 5f739f0fd777..e55296ad3f10 100644
--- a/openldap/ExternalProject_openldap.mk
+++ b/openldap/ExternalProject_openldap.mk
@@ -32,8 +32,8 @@ $(call gb_ExternalProject_get_state_target,openldap,build) :
$(if $(filter YES,$(SYSTEM_NSS)), \
CPPFLAGS="$(NSS_CFLAGS)" CFLAGS="$(NSS_CFLAGS)" LDFLAGS="$(NSS_LIBS)" \
, \
- CPPFLAGS="-I $(OUTDIR)/inc/mozilla/nss -I $(OUTDIR)/inc/mozilla/nspr" \
- CFLAGS="-I $(OUTDIR)/inc/mozilla/nss -I $(OUTDIR)/inc/mozilla/nspr" \
+ 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$(OUTDIR)/lib" \
) \
&& MAKEFLAGS= && $(MAKE) \