loolwsd/Makefile.am | 5 +++++ loolwsd/configure.ac | 3 ++- 2 files changed, 7 insertions(+), 1 deletion(-)
New commits: commit a8601804ac5c19e105e84b6626bba23bcc5d7513 Author: Andras Timar <[email protected]> Date: Thu Apr 14 15:06:49 2016 +0200 loolwsd: process loolwsd.xml.in diff --git a/loolwsd/Makefile.am b/loolwsd/Makefile.am index 40cbb69..1f696c4 100644 --- a/loolwsd/Makefile.am +++ b/loolwsd/Makefile.am @@ -8,6 +8,10 @@ loolwsddatadir = @LOOLWSD_DATADIR@ loolwsddata_DATA = discovery.xml +loolwsdconfigdir = @LOOLWSD_CONFIGDIR@ + +loolwsdconfig_DATA = loolwsd.xml + ACLOCAL_AMFLAGS = -I m4 AM_CPPFLAGS = -pthread -DLOOLWSD_DATADIR='"@LOOLWSD_DATADIR@"' -DLOOLWSD_CONFIGDIR='"@LOOLWSD_CONFIGDIR@"' @@ -90,6 +94,7 @@ noinst_HEADERS = Admin.hpp \ security.h EXTRA_DIST = discovery.xml \ + loolwsd.xml.in \ loolwsd.service \ sysconfig.loolwsd \ etc/key.pem \ diff --git a/loolwsd/configure.ac b/loolwsd/configure.ac index c9f9a49..8df2e11 100644 --- a/loolwsd/configure.ac +++ b/loolwsd/configure.ac @@ -237,7 +237,8 @@ AC_SUBST(LOOLWSD_DATADIR) AC_CONFIG_FILES([Makefile test/Makefile - loolwsd.spec]) + loolwsd.spec + loolwsd.xml]) AC_CONFIG_FILES([test/run_unit.sh],[chmod +x test/run_unit.sh]) AC_CONFIG_FILES([test/run_test.sh],[chmod +x test/run_test.sh]) _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
