loolwsd/Makefile.am | 2 +- loolwsd/configure.ac | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-)
New commits: commit 24bc4587415fb41e0b8223e11d570497abd67216 Author: Andras Timar <[email protected]> Date: Thu Apr 14 12:34:11 2016 +0200 define LOOLWSD_CONFIGDIR and LOOLWSD_DATADIR diff --git a/loolwsd/Makefile.am b/loolwsd/Makefile.am index 2afdd8f..3c87583 100644 --- a/loolwsd/Makefile.am +++ b/loolwsd/Makefile.am @@ -6,7 +6,7 @@ dist_bin_SCRIPTS = loolwsd-systemplate-setup discovery.xml ACLOCAL_AMFLAGS = -I m4 -AM_CPPFLAGS = -pthread +AM_CPPFLAGS = -pthread -DLOOLWSD_DATADIR='"@LOOLWSD_DATADIR@"' -DLOOLWSD_CONFIGDIR='"@LOOLWSD_CONFIGDIR@"' AM_LDFLAGS = -pthread -Wl,-E AM_ETAGSFLAGS = --c++-kinds=+p --fields=+iaS --extra=+q -R --totals=yes * diff --git a/loolwsd/configure.ac b/loolwsd/configure.ac index 28faacc..a396d87 100644 --- a/loolwsd/configure.ac +++ b/loolwsd/configure.ac @@ -226,12 +226,12 @@ done AC_DEFINE_UNQUOTED([LOOLWSD_CACHEDIR],["$LOOLWSD_CACHEDIR"],[Cache folder]) AC_SUBST(LOOLWSD_CACHEDIR) -# FIXME -# LOOLWSD_CONFIGDIR=${sysconfdir}/${PACKAGE} -> #define LOOLWSD_CONFIGDIR "${prefix}/etc/loolwsd" in config.h ??? -LOOLWSD_CONFIGDIR=/etc/${PACKAGE} -AC_DEFINE_UNQUOTED([LOOLWSD_CONFIGDIR],["$LOOLWSD_CONFIGDIR"],[Config folder]) +LOOLWSD_CONFIGDIR=${sysconfdir}/${PACKAGE} AC_SUBST(LOOLWSD_CONFIGDIR) +LOOLWSD_DATADIR=${datadir}/${PACKAGE} +AC_SUBST(LOOLWSD_DATADIR) + AC_CONFIG_FILES([Makefile test/Makefile loolwsd.spec]) _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
