[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

[SCM] LibreOffice packaging repository branch, ubuntu-saucy-4.1, updated. libreoffice_4.1.0_beta2-2-343-g6f91b7c



The following commit has been merged in the ubuntu-saucy-4.1 branch:
commit 83973f23fadc2ed2c1e0b2bfe319c04f15599a35
Author: Bjoern Michaelsen <bjoern.michaelsen@canonical.com>
Date:   Thu Jun 13 01:18:50 2013 +0200

    make check target configurable

diff --git a/rules b/rules
index 1f76973..afd4147 100755
--- a/rules
+++ b/rules
@@ -118,6 +118,8 @@ BUILD_DEPS=\
     zip,\
     zlib1g-dev\
 
+
+CHECKTARGET:=check
 # These are components which can be built from internal copies, or used from the
 # distribution. See configure --help for valid values (--with-system-<value>).
 SYSTEM_STUFF = dicts
@@ -1817,7 +1819,7 @@ endif
 		export HOME=$$t; \
 		export SAL_USE_VCLPLUGIN="svp"; \
 		if [ -x /usr/bin/gdb ]; then ulimit -c unlimited; fi && \
-		$(MAKE) -k check || $(MAKE) check && \
+		$(MAKE) -k $(CHECKTARGET) || $(MAKE) $(CHECKTARGET) && \
 	rm -rf $$t
 
 ifneq (,$(findstring $(DEB_HOST_ARCH),$(OOO_NO_BASE_ARCHS)))

-- 
LibreOffice packaging repository


Reply to: