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 /external/curl | |
| parent | 90d7723085a8da0929c7c17587a7717ceeb23d36 (diff) | |
gbuild: remove gb_ExternalPackage_add_library_for_install
Deliver all external libraries to INSTDIR directly.
Change-Id: I8d3e035e5cfa07bd0f53ee4a226c48d4b86a4032
Diffstat (limited to 'external/curl')
| -rw-r--r-- | external/curl/ExternalPackage_curl.mk | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/external/curl/ExternalPackage_curl.mk b/external/curl/ExternalPackage_curl.mk index 9766766fa08b..89b8699bd374 100644 --- a/external/curl/ExternalPackage_curl.mk +++ b/external/curl/ExternalPackage_curl.mk @@ -9,18 +9,20 @@ $(eval $(call gb_ExternalPackage_ExternalPackage,curl,curl)) +$(eval $(call gb_ExternalPackage_set_outdir,curl,$(INSTROOT))) + $(eval $(call gb_ExternalPackage_use_external_project,curl,curl)) ifneq ($(DISABLE_DYNLOADING),TRUE) ifeq ($(OS)$(COM),WNTGCC) -$(eval $(call gb_ExternalPackage_add_library_for_install,curl,bin/libcurl.dll,lib/.libs/libcurl.dll)) +$(eval $(call gb_ExternalPackage_add_file,curl,$(LIBO_LIB_FOLDER)/libcurl.dll,lib/.libs/libcurl.dll)) else ifeq ($(COM),MSC) -$(eval $(call gb_ExternalPackage_add_library_for_install,curl,bin/libcurl.dll,lib/libcurl.dll)) +$(eval $(call gb_ExternalPackage_add_file,curl,$(LIBO_LIB_FOLDER)/libcurl.dll,lib/libcurl.dll)) else ifeq ($(OS),AIX) -$(eval $(call gb_ExternalPackage_add_library_for_install,curl,lib/libcurl.so,lib/.libs/libcurl.so.4)) +$(eval $(call gb_ExternalPackage_add_file,curl,$(LIBO_LIB_FOLDER)/libcurl.so,lib/.libs/libcurl.so.4)) else -$(eval $(call gb_ExternalPackage_add_library_for_install,curl,lib/libcurl.so.4,lib/.libs/libcurl.so.4.2.0)) +$(eval $(call gb_ExternalPackage_add_file,curl,$(LIBO_LIB_FOLDER)/libcurl.so.4,lib/.libs/libcurl.so.4.2.0)) endif endif # $(DISABLE_DYNLOADING) |