libxml2/ExternalPackage_xml2.mk | 4 ++--
libxslt/ExternalPackage_xslt.mk | 8 ++++----
2 files changed, 6 insertions(+), 6 deletions(-)
New commits:
commit 72750a4a544ab923afb7247f398f6e796b388ade
Author: David Tardon <dtar...@redhat.com>
Date: Sun Sep 8 10:18:32 2013 +0200
fix delivery on mac
Change-Id: I1d7fb85521ea6f1c5bd93c2318013a0ec514bf61
diff --git a/libxslt/ExternalPackage_xslt.mk b/libxslt/ExternalPackage_xslt.mk
index c1be5b6..c9586b8 100644
--- a/libxslt/ExternalPackage_xslt.mk
+++ b/libxslt/ExternalPackage_xslt.mk
@@ -16,10 +16,10 @@ $(eval $(call
gb_ExternalPackage_add_file,xslt,bin/xslt-config,xslt-config))
endif
ifeq ($(OS),MACOSX)
-$(eval $(call
gb_ExternalPackage_add_library_for_install,xslt,lib/libxslt.1.dylib,libxslt/.libs/libxslt.1.1.26.dylib))
-$(eval $(call
gb_ExternalPackage_add_file,xslt,lib/libxslt.dylib,libxslt/.libs/libxslt.1.1.26.dylib))
-$(eval $(call
gb_ExternalPackage_add_library_for_install,xslt,lib/libexslt.0.dylib,libexslt/.libs/libexslt.0.8.15.dylib))
-$(eval $(call
gb_ExternalPackage_add_file,xslt,lib/libexslt.dylib,libexslt/.libs/libexslt.0.8.15.dylib))
+$(eval $(call
gb_ExternalPackage_add_library_for_install,xslt,lib/libxslt.1.dylib,libxslt/.libs/libxslt.1.dylib))
+$(eval $(call
gb_ExternalPackage_add_file,xslt,lib/libxslt.dylib,libxslt/.libs/libxslt.1.dylib))
+$(eval $(call
gb_ExternalPackage_add_library_for_install,xslt,lib/libexslt.0.dylib,libexslt/.libs/libexslt.0.dylib))
+$(eval $(call
gb_ExternalPackage_add_file,xslt,lib/libexslt.dylib,libexslt/.libs/libexslt.0.dylib))
$(eval $(call
gb_ExternalPackage_add_file,xslt,bin/xsltproc,xsltproc/.libs/xsltproc))
else ifeq ($(DISABLE_DYNLOADING),TRUE)
$(eval $(call
gb_ExternalPackage_add_file,xslt,lib/libxslt.a,libxslt/.libs/libxslt.a))
commit 949d4f5544bda58135aeb188446aa98830c2ff5c
Author: David Tardon <dtar...@redhat.com>
Date: Sun Sep 8 10:09:15 2013 +0200
fix delivery on mac
Change-Id: I4e9a7fdf4e9b7bf63549322c7c1d287384bb9d26
diff --git a/libxml2/ExternalPackage_xml2.mk b/libxml2/ExternalPackage_xml2.mk
index c3d9a1b..24dd5ef 100644
--- a/libxml2/ExternalPackage_xml2.mk
+++ b/libxml2/ExternalPackage_xml2.mk
@@ -16,8 +16,8 @@ $(eval $(call
gb_ExternalPackage_add_file,xml2,bin/xml2-config,xml2-config))
endif
ifeq ($(OS),MACOSX)
-$(eval $(call
gb_ExternalPackage_add_library_for_install,xml2,lib/libxml2.2.dylib,.libs/libxml2.2.7.6.dylib,xml2))
-$(eval $(call
gb_ExternalPackage_add_file,xml2,lib/libxml2.dylib,.libs/libxml2.2.7.6.dylib))
+$(eval $(call
gb_ExternalPackage_add_library_for_install,xml2,lib/libxml2.2.dylib,.libs/libxml2.2.dylib,xml2))
+$(eval $(call
gb_ExternalPackage_add_file,xml2,lib/libxml2.dylib,.libs/libxml2.2.dylib))
$(eval $(call gb_ExternalPackage_add_file,xml2,bin/xmllint,.libs/xmllint))
else ifeq ($(DISABLE_DYNLOADING),TRUE)
$(eval $(call gb_ExternalPackage_add_file,xml2,lib/libxml2.a,.libs/libxml2.a))
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
