Rebased ref, commits from common ancestor:
commit 57992e5b1dca22ae547abd3c40f62222bf3c2a46
Author: Andrzej Hunt <andr...@ahunt.org>
Date: Sun Mar 8 16:41:58 2015 +0000
Fix udunits linking.
Change-Id: Iab5d4e8d0c75310d9347ac910c45e6aaa8216ae1
diff --git a/external/udunits2/ExternalPackage_udunits2.mk
b/external/udunits2/ExternalPackage_udunits2.mk
index a93da13..4073463 100644
--- a/external/udunits2/ExternalPackage_udunits2.mk
+++ b/external/udunits2/ExternalPackage_udunits2.mk
@@ -16,7 +16,9 @@ $(eval $(call
gb_ExternalPackage_add_file,udunits2,$(LIBO_LIB_FOLDER)/iudunits2.
else ifeq ($(OS),MACOSX)
$(eval $(call
gb_ExternalPackage_add_file,udunits2,$(LIBO_LIB_FOLDER)/libudunits2.dylib,lib/.libs/libudunits2.dylib))
else
-$(eval $(call
gb_ExternalPackage_add_file,udunits2,$(LIBO_LIB_FOLDER)/libudunits2.so.0,lib/.libs/libudunits2.so.0.1.0))
+$(eval $(call
gb_ExternalPackage_add_file,udunits2,$(LIBO_LIB_FOLDER)/libudunits2.so,lib/.libs/libudunits2.so))
+$(eval $(call
gb_ExternalPackage_add_file,udunits2,$(LIBO_LIB_FOLDER)/libudunits2.so.0,lib/.libs/libudunits2.so.0))
+$(eval $(call
gb_ExternalPackage_add_file,udunits2,$(LIBO_LIB_FOLDER)/libudunits2.so.0.1.0,lib/.libs/libudunits2.so.0.1.0))
endif
$(eval $(call
gb_ExternalPackage_add_file,udunits2,$(LIBO_SHARE_FOLDER)/udunits2/udunits2.xml,lib/udunits2.xml))
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
