diff options
| author | Michael Stahl <mstahl@redhat.com> | 2013-10-25 22:36:07 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2013-10-27 00:50:02 +0200 |
| commit | 349015b18e285b9642e0b16a5e4db61ef347a6a8 (patch) | |
| tree | be3b36ba75e167cea6d13f91e26fcc596e9e2d28 /nss | |
| parent | 90d7723085a8da0929c7c17587a7717ceeb23d36 (diff) | |
gbuild: remove gb_ExternalPackage_add_library_for_install
Deliver all external libraries to INSTDIR directly.
Change-Id: I8d3e035e5cfa07bd0f53ee4a226c48d4b86a4032
Diffstat (limited to 'nss')
| -rw-r--r-- | nss/ExternalPackage_nss.mk | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/nss/ExternalPackage_nss.mk b/nss/ExternalPackage_nss.mk index e4323ea20109..664f8ac25870 100644 --- a/nss/ExternalPackage_nss.mk +++ b/nss/ExternalPackage_nss.mk @@ -9,10 +9,12 @@ $(eval $(call gb_ExternalPackage_ExternalPackage,nss,nss)) +$(eval $(call gb_ExternalPackage_set_outdir,nss,$(INSTROOT))) + $(eval $(call gb_ExternalPackage_use_external_project,nss,nss)) ifeq ($(OS),MACOSX) -$(eval $(call gb_ExternalPackage_add_libraries_for_install,nss,lib,\ +$(eval $(call gb_ExternalPackage_add_files,nss,$(LIBO_LIB_FOLDER),\ mozilla/dist/out/lib/libfreebl3.dylib \ mozilla/dist/out/lib/libnspr4.dylib \ mozilla/dist/out/lib/libnss3.dylib \ @@ -26,7 +28,7 @@ $(eval $(call gb_ExternalPackage_add_libraries_for_install,nss,lib,\ mozilla/dist/out/lib/libssl3.dylib \ )) else ifeq ($(OS),WNT) -$(eval $(call gb_ExternalPackage_add_libraries_for_install,nss,bin,\ +$(eval $(call gb_ExternalPackage_add_files,nss,$(LIBO_LIB_FOLDER),\ mozilla/dist/out/lib/freebl3.dll \ mozilla/dist/out/lib/nspr4.dll \ mozilla/dist/out/lib/nss3.dll \ @@ -41,7 +43,7 @@ $(eval $(call gb_ExternalPackage_add_libraries_for_install,nss,bin,\ mozilla/dist/out/lib/ssl3.dll \ )) else # OS!=WNT/MACOSX -$(eval $(call gb_ExternalPackage_add_libraries_for_install,nss,lib,\ +$(eval $(call gb_ExternalPackage_add_files,nss,$(LIBO_LIB_FOLDER),\ mozilla/dist/out/lib/libfreebl3.so \ mozilla/dist/out/lib/libnspr4.so \ mozilla/dist/out/lib/libnss3.so \ |