diff options
| author | Peter Foley <pefoley2@verizon.net> | 2013-01-01 09:39:36 -0500 |
|---|---|---|
| committer | Luboš Luňák <l.lunak@suse.cz> | 2013-01-02 16:21:23 +0000 |
| commit | c003d25d24786073229d0f8e545b2863c27fa282 (patch) | |
| tree | c79f8c7f34a51ae34d7599076dccb92a5955516d /RepositoryExternal.mk | |
| parent | dc277bc6a1c357fe725db2c567d3e1cf16fb7806 (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 'RepositoryExternal.mk')
| -rw-r--r-- | RepositoryExternal.mk | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index cb63693fa885..0b3fc76a19bb 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -2206,9 +2206,7 @@ endif # GUIBASE=unx ifeq (,$(filter DESKTOP,$(BUILD_TYPE))) -define gb_LinkTarget__use_nss3 - -endef +gb_LinkTarget__use_nss3:= else @@ -2245,10 +2243,11 @@ $(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO,\ )) define gb_LinkTarget__use_nss3 +$(call gb_LinkTarget_use_package,$(1),nss) $(call gb_LinkTarget_set_include,$(1),\ $$(INCLUDE) \ - -I$(OUTDIR)/inc/mozilla/nspr \ - -I$(OUTDIR)/inc/mozilla/nss \ + -I$(call gb_UnpackedTarball_get_dir,nss)/mozilla/dist/public/nss \ + -I$(call gb_UnpackedTarball_get_dir,nss)/mozilla/dist/out/include \ ) $(call gb_LinkTarget_use_libraries,$(1),\ @@ -2260,6 +2259,7 @@ $(call gb_LinkTarget_use_libraries,$(1),\ endef define gb_LinkTarget__use_plc4 +$(call gb_LinkTarget_use_package,$(1),nss) $(call gb_LinkTarget_use_libraries,$(1),\ plc4 \ ) |