summaryrefslogtreecommitdiff
path: root/curl/ExternalPackage_curl.mk
diff options
context:
space:
mode:
authorDavid Tardon <dtardon@redhat.com>2013-05-01 11:23:50 +0200
committerDavid Tardon <dtardon@redhat.com>2013-05-01 16:55:38 +0200
commit491dea0a1fd16547a61d6045a8bfaa83e58aa93d (patch)
treee48b1598ede18cd322180685a969e3a3e6a553f6 /curl/ExternalPackage_curl.mk
parent61f59c46f6476a5e96fea143bc31d87c7de58ed2 (diff)
use gb_ExternalPackage_add_runtime_library for adding libs
Change-Id: I7be80bbef306db8f7ad585e95bfa4b6da0b30067
Diffstat (limited to 'curl/ExternalPackage_curl.mk')
-rw-r--r--curl/ExternalPackage_curl.mk10
1 files changed, 6 insertions, 4 deletions
diff --git a/curl/ExternalPackage_curl.mk b/curl/ExternalPackage_curl.mk
index f7881ead01cc..5f552602baf0 100644
--- a/curl/ExternalPackage_curl.mk
+++ b/curl/ExternalPackage_curl.mk
@@ -22,21 +22,23 @@ $(eval $(call gb_ExternalPackage_add_file,curl,lib/libcurl.a,lib/.libs/libcurl.a
else ifeq ($(OS),ANDROID)
$(eval $(call gb_ExternalPackage_add_file,curl,lib/libcurl.so,lib/.libs/libcurl.so))
else ifeq ($(OS),AIX)
-$(eval $(call gb_ExternalPackage_add_file,curl,lib/libcurl.so,lib/.libs/libcurl.so.4))
+$(eval $(call gb_ExternalPackage_add_library_for_install,curl,lib/libcurl.so,lib/.libs/libcurl.so.4))
else
-$(eval $(call gb_ExternalPackage_add_file,curl,lib/libcurl.so,lib/.libs/libcurl.so.4.2.0))
+# TODO: Do we really want the unversioned library in the installation?
+# And if that's true, why do we need to deliver the versioned one at all?
+$(eval $(call gb_ExternalPackage_add_library_for_install,curl,lib/libcurl.so,lib/.libs/libcurl.so.4.2.0))
$(eval $(call gb_ExternalPackage_add_file,curl,lib/libcurl.so.4,lib/.libs/libcurl.so.4.2.0))
endif
else ifeq ($(OS)$(COM),WNTGCC)
$(eval $(call gb_ExternalPackage_add_file,curl,lib/libcurl.a,lib/.libs/libcurl.a))
-$(eval $(call gb_ExternalPackage_add_file,curl,bin/libcurl.dll,lib/.libs/libcurl.dll))
+$(eval $(call gb_ExternalPackage_add_library_for_install,curl,bin/libcurl.dll,lib/.libs/libcurl.dll))
else ifeq ($(COM),MSC)
$(eval $(call gb_ExternalPackage_add_file,curl,lib/libcurl.lib,lib/libcurl.lib))
-$(eval $(call gb_ExternalPackage_add_file,curl,bin/libcurl.dll,lib/libcurl.dll))
+$(eval $(call gb_ExternalPackage_add_library_for_install,curl,bin/libcurl.dll,lib/libcurl.dll))
endif