Fix build without --with-lo-path
This commit is contained in:
parent
773dad57ba
commit
255f9304e9
2 changed files with 15 additions and 3 deletions
|
@ -88,7 +88,9 @@ EXTRA_DIST = discovery.xml \
|
|||
|
||||
if HAVE_LO_PATH
|
||||
|
||||
@SYSTEMPLATE_PATH@/system_stamp :
|
||||
SYSTEM_STAMP = @SYSTEMPLATE_PATH@/system_stamp
|
||||
|
||||
$(SYSTEM_STAMP) :
|
||||
if test "z@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; \
|
||||
|
|
|
@ -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)
|
||||
|
|
Loading…
Reference in a new issue