curl/ExternalPackage_curl.mk | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
New commits:
commit 685852d89235c58df32c4cae4069cbaa24caf62f
Author: Tor Lillqvist <t...@iki.fi>
Date: Tue Oct 30 11:09:38 2012 +0200
Correct location of the libtool-built libcurl
Change-Id: I0b997cdd3c133fa2212d519a136fa17f08a68730
diff --git a/curl/ExternalPackage_curl.mk b/curl/ExternalPackage_curl.mk
index e8e7e65..edd410a 100644
--- a/curl/ExternalPackage_curl.mk
+++ b/curl/ExternalPackage_curl.mk
@@ -18,17 +18,17 @@ $(eval $(call
gb_ExternalPackage_add_file,curl,lib/pkgconfig/libcurl.pc,libcurl.
endif
ifeq ($(DISABLE_DYNLOADING),TRUE)
-$(eval $(call gb_ExternalPackage_add_file,curl,lib/libcurl.a,.libs/libcurl.a))
+$(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,.libs/libcurl.so))
+$(eval $(call
gb_ExternalPackage_add_file,curl,lib/libcurl.so,lib/.libs/libcurl.so))
else
$(eval $(call
gb_ExternalPackage_add_file,curl,lib/libcurl.so,lib/.libs/libcurl.so.4.2.0))
endif
else ifeq ($(OS)$(COM),WNTGCC)
-$(eval $(call gb_ExternalPackage_add_file,curl,lib/libcurl.a,.libs/libcurl.a))
-$(eval $(call
gb_ExternalPackage_add_file,curl,bin/libcurl.dll,.libs/libcurl.dll))
+$(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))
else ifeq ($(COM),MSC)
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
