diff options
-rw-r--r-- | external/curl/ExternalPackage_curl.mk | 6 | ||||
-rw-r--r-- | scp2/source/ooo/file_library_ooo.scp | 2 |
2 files changed, 3 insertions, 5 deletions
diff --git a/external/curl/ExternalPackage_curl.mk b/external/curl/ExternalPackage_curl.mk index 5f552602baf0..e9cb7a10a127 100644 --- a/external/curl/ExternalPackage_curl.mk +++ b/external/curl/ExternalPackage_curl.mk @@ -24,10 +24,8 @@ $(eval $(call gb_ExternalPackage_add_file,curl,lib/libcurl.so,lib/.libs/libcurl. else ifeq ($(OS),AIX) $(eval $(call gb_ExternalPackage_add_library_for_install,curl,lib/libcurl.so,lib/.libs/libcurl.so.4)) else -# 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)) +$(eval $(call gb_ExternalPackage_add_file,curl,lib/libcurl.so,lib/.libs/libcurl.so.4.2.0)) +$(eval $(call gb_ExternalPackage_add_library_for_install,curl,lib/libcurl.so.4,lib/.libs/libcurl.so.4.2.0)) endif else ifeq ($(OS)$(COM),WNTGCC) diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp index 3bf6ec93333b..d8245c93f989 100644 --- a/scp2/source/ooo/file_library_ooo.scp +++ b/scp2/source/ooo/file_library_ooo.scp @@ -92,7 +92,7 @@ File gid_File_Lib_Curl #ifdef MACOSX Name = STRING(CONCAT2(libcurl.4,UNXSUFFIX)); #else - Name = STRING(CONCAT2(libcurl,UNXSUFFIX)); + Name = STRING(CONCAT3(libcurl,UNXSUFFIX,.4)); #endif #else #ifdef _gcc3 |