[Libreoffice-commits] core.git: connectivity/Library_mozabdrv.mk moz/ExternalPackage_moz_inc.mk

David Ostrovsky david at ostrovsky.org
Mon Feb 25 10:33:03 PST 2013


 connectivity/Library_mozabdrv.mk |    5 +++++
 moz/ExternalPackage_moz_inc.mk   |    2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

New commits:
commit c66e2c4836fa3780c5cabbb511968557121d5cc1
Author: David Ostrovsky <david at ostrovsky.org>
Date:   Mon Feb 25 19:25:31 2013 +0100

    mozabdrv: add dependency to internal mozilla
    
    Change-Id: Id22ba6632f273159838923bf26420d27dd8a89d3

diff --git a/connectivity/Library_mozabdrv.mk b/connectivity/Library_mozabdrv.mk
index b5b2f3a..bf088bc 100644
--- a/connectivity/Library_mozabdrv.mk
+++ b/connectivity/Library_mozabdrv.mk
@@ -45,6 +45,11 @@ $(eval $(call gb_Library_use_libraries,mozabdrv,\
 	$(gb_UWINAPI) \
 ))
 
+$(eval $(call gb_Library_use_package,mozabdrv,\
+	moz_inc \
+	moz_lib \
+))
+
 $(eval $(call gb_Library_use_externals,mozabdrv,\
 	boost_headers \
 	mozilla \
diff --git a/moz/ExternalPackage_moz_inc.mk b/moz/ExternalPackage_moz_inc.mk
index dd38f32..fb399a6 100644
--- a/moz/ExternalPackage_moz_inc.mk
+++ b/moz/ExternalPackage_moz_inc.mk
@@ -9,7 +9,7 @@
 
 $(eval $(call gb_ExternalPackage_ExternalPackage,moz_inc,moz_inc))
 
-MOZ_INC = $(subst $(call gb_UnpackedTarball_get_dir,moz_inc),,$(shell find $(call gb_UnpackedTarball_get_dir,moz_inc) -type f 2>/dev/null))
+MOZ_INC = $(subst $(call gb_UnpackedTarball_get_dir,moz_inc),,$(shell find $(call gb_UnpackedTarball_get_dir,moz_inc) -type f))
 
 $(eval $(call gb_ExternalPackage_add_unpacked_files,moz_inc,inc/mozilla,\
 	$(MOZ_INC) \


More information about the Libreoffice-commits mailing list