From fd37805ac073170b88557aeec138e694a781d661 Mon Sep 17 00:00:00 2001 From: Vraiment Date: Thu, 8 Feb 2018 10:30:00 -0800 Subject: [PATCH] Make sesman.ini dynamic for the location of the configuration file --- .gitignore | 1 + sesman/Makefile.am | 11 +++++++++++ sesman/{sesman.ini => sesman.ini.in} | 2 +- 3 files changed, 13 insertions(+), 1 deletion(-) rename sesman/{sesman.ini => sesman.ini.in} (98%) diff --git a/.gitignore b/.gitignore index 2ddb7ce1..c3946d68 100644 --- a/.gitignore +++ b/.gitignore @@ -38,6 +38,7 @@ sesman/tools/xrdp-sesrun sesman/tools/xrdp-sestest sesman/tools/xrdp-xcon sesman/xrdp-sesman +sesman/sesman.ini *.so stamp-h1 xrdp/xrdp diff --git a/sesman/Makefile.am b/sesman/Makefile.am index 193a7cce..50425e63 100644 --- a/sesman/Makefile.am +++ b/sesman/Makefile.am @@ -75,6 +75,17 @@ xrdp_sesman_LDADD = \ sesmansysconfdir=$(sysconfdir)/xrdp +SUBST_VARS = sed \ + -e 's|@sesmansysconfdir[@]|$(sesmansysconfdir)|g' + +subst_verbose = $(subst_verbose_@AM_V@) +subst_verbose_ = $(subst_verbose_@AM_DEFAULT_V@) +subst_verbose_0 = @echo " SUBST $@"; + +SUFFIXES = .in +.in: + $(subst_verbose)$(SUBST_VARS) $< > $@ + dist_sesmansysconf_DATA = \ sesman.ini diff --git a/sesman/sesman.ini b/sesman/sesman.ini.in similarity index 98% rename from sesman/sesman.ini rename to sesman/sesman.ini.in index 01bc8fa3..fff7b888 100644 --- a/sesman/sesman.ini +++ b/sesman/sesman.ini.in @@ -99,4 +99,4 @@ param=96 FuseMountName=thinclient_drives [SessionVariables] -PULSE_SCRIPT=/etc/xrdp/pulse/default.pa +PULSE_SCRIPT=@sesmansysconfdir@/pulse/default.pa