[Libreoffice-commits] online.git: Branch 'distro/collabora/milestone-7' - loolwsd/debian

[Andras Timar]

 loolwsd/debian/rules |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

New commits:
commit 554e560ce5c39a7d00502305a8c065e5d24d670b
Author: Andras Timar <andras.timar at collabora.com>
Date:   Fri Jan 8 21:41:57 2016 +0100

    loolwsd: deb rules: fix build of tests, and do not run tests

diff --git a/loolwsd/debian/rules b/loolwsd/debian/rules
index 03fce27..5ac9c8a 100755
--- a/loolwsd/debian/rules
+++ b/loolwsd/debian/rules
@@ -5,7 +5,7 @@ DPKG_EXPORT_BUILDFLAGS = 1
 
 include /usr/share/dpkg/default.mk
 
-CONFFLAGS = --prefix=/usr --localstatedir=/var --with-lokit-path=bundled/include --disable-tests
+CONFFLAGS = --prefix=/usr --localstatedir=/var --with-lokit-path=`pwd`/bundled/include --disable-tests
 
 # Avoid setcap when doing "make", when building for packaging
 # the setcap is done at installation time
@@ -17,3 +17,6 @@ export BUILDING_FROM_RPMBUILD=yes
 
 override_dh_auto_configure:
 	./configure $(CONFFLAGS)
+
+override_dh_auto_test:
+	# do not test