[Libreoffice-commits] online.git: loolwsd/Makefile.am loolwsd/test

[Tor Lillqvist]

 loolwsd/Makefile.am      |   10 ++++++++--
 loolwsd/test/Makefile.am |    8 +++++++-
 2 files changed, 15 insertions(+), 3 deletions(-)

New commits:
commit 255f9304e94ef4f6cae9b8d4ab397efe1f654673
Author: Tor Lillqvist <tml at collabora.com>
Date:   Tue Apr 12 09:29:57 2016 +0300

    Fix build without --with-lo-path

diff --git a/loolwsd/Makefile.am b/loolwsd/Makefile.am
index 0a336fe..d674e55 100644
--- a/loolwsd/Makefile.am
+++ b/loolwsd/Makefile.am
@@ -88,7 +88,9 @@ EXTRA_DIST = discovery.xml \
 
 if HAVE_LO_PATH
 
- at SYSTEMPLATE_PATH@/system_stamp :
+SYSTEM_STAMP = @SYSTEMPLATE_PATH@/system_stamp
+
+$(SYSTEM_STAMP) :
 	if test "z at SYSTEMPLATE_PATH@" != "z"; then rm -rf "@SYSTEMPLATE_PATH@"; fi
 	${top_srcdir}/loolwsd-systemplate-setup "@SYSTEMPLATE_PATH@" "@LO_PATH@" && touch $@
 
@@ -104,6 +106,10 @@ run: @JAILS_PATH@ @SYSTEMPLATE_PATH@/system_stamp
 	@echo "   https://localhost:9980/loleaflet/dist/loleaflet.html?file_path=file://$(abs_top_srcdir)/test/data/hello.odt&host=wss://localhost:9980"
 	./loolwsd --systemplate="@SYSTEMPLATE_PATH@" --lotemplate="@LO_PATH@" \
                   --childroot="@JAILS_PATH@" --allowlocalstorage
+else
+
+SYSTEM_STAMP =
+
 endif
 
 clean-cache:
@@ -116,7 +122,7 @@ clean-cache:
 # capabilities won't survive packaging anyway. Instead, handle it when
 # installing the RPM or Debian package.
 
-all-local: loolforkit certificates @JAILS_PATH@ @SYSTEMPLATE_PATH@/system_stamp
+all-local: loolforkit certificates @JAILS_PATH@ $(SYSTEM_STAMP)
 	if test "$$BUILDING_FROM_RPMBUILD" != yes; then \
 	    sudo @SETCAP@ cap_fowner,cap_mknod,cap_sys_chroot=ep loolforkit; \
 	    sudo @SETCAP@ cap_sys_admin=ep loolmount; \
diff --git a/loolwsd/test/Makefile.am b/loolwsd/test/Makefile.am
index 49c2567..7ac0fd4 100644
--- a/loolwsd/test/Makefile.am
+++ b/loolwsd/test/Makefile.am
@@ -24,8 +24,14 @@ unit_prefork_la_LDFLAGS = -module
 unit_storage_la_SOURCES = UnitStorage.cpp
 unit_storage_la_LDFLAGS = -module
 
+if HAVE_LO_PATH
+SYSTEM_STAMP = ${systemplate}/system_stamp
+else
+SYSTEM_STAMP =
+endif
+
 ${top_builddir}/test/run_unit.sh.log ${top_builddir}/test/run_unit.sh.trs : \
-	${systemplate}/system_stamp @JAILS_PATH@ \
+	$(SYSTEM_STAMP) @JAILS_PATH@ \
 	${top_srcdir}/test/run_unit.sh \
 	${top_builddir}/loolwsd ${top_builddir}/loolforkit \
 	$(wildcard *.la)