[Libreoffice-commits] .: 2 commits - cppunit/ExternalPackage_cppunit.mk RepositoryExternal.mk

Libreoffice Gerrit user logerrit at kemper.freedesktop.org
Thu Dec 6 23:11:46 PST 2012


 RepositoryExternal.mk              |    2 +-
 cppunit/ExternalPackage_cppunit.mk |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 39a6e45bfd60db59321ecbfc406a942b346bb0ff
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Fri Dec 7 08:11:16 2012 +0100

    cppunit is PLAINLIBS_NONE
    
    Change-Id: I98765698773f9b349d6aac200ee2e55c25e7a47a

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index f59c69a..e22d219 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -144,7 +144,7 @@ endef
 
 else
 
-$(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO,\
+$(eval $(call gb_Helper_register_libraries,PLAINLIBS_NONE,\
     cppunit \
 ))
 
commit b5b316ad7f5f5b77abe1e9e2e93f6aee62d2373b
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Fri Dec 7 08:10:48 2012 +0100

    One more typo
    
    Change-Id: Ie08b5ebf76f22a42c99729a284bf1931a7cf9bc9

diff --git a/cppunit/ExternalPackage_cppunit.mk b/cppunit/ExternalPackage_cppunit.mk
index dfcc659..4c430e8 100644
--- a/cppunit/ExternalPackage_cppunit.mk
+++ b/cppunit/ExternalPackage_cppunit.mk
@@ -23,7 +23,7 @@ endif
 else
 $(eval $(call gb_ExternalPackage_add_file,cppunit,bin/DllPlugInTester,src/DllPlugInTester/.libs/DllPlugInTester))
 ifeq ($(OS),MACOSX)
-$(eval $(call gb_ExternalPackage_add_file,cppunit,bin/libcppunit-1.13.0.dylib,src/cppunit/.libs/libcppunit-1.13.0.dylib))
+$(eval $(call gb_ExternalPackage_add_file,cppunit,lib/libcppunit-1.13.0.dylib,src/cppunit/.libs/libcppunit-1.13.0.dylib))
 else ifeq ($(OS),AIX)
 $(eval $(call gb_ExternalPackage_add_file,cppunit,lib/libcppunit-1.13.a,src/cppunit/.libs/libcppunit-1.13.a))
 else ifeq ($(OS),OPENBSD)


More information about the Libreoffice-commits mailing list