From 19bacc6e4967231557c69b536ac083a5bd4471c7 Mon Sep 17 00:00:00 2001 From: Koichiro Iwao Date: Thu, 1 Aug 2024 20:17:12 +0900 Subject: [PATCH] Include {xrdp,sesman}.ini.in instead of substituted .ini in tarball These config files are intended to be substituted during the build process. The substituted .ini files should not be included in release tarballs. Fixes: #3187 --- sesman/Makefile.am | 5 ++++- xrdp/Makefile.am | 7 ++++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/sesman/Makefile.am b/sesman/Makefile.am index 7b34470c58..8d9d31022c 100644 --- a/sesman/Makefile.am +++ b/sesman/Makefile.am @@ -27,6 +27,7 @@ xrdp_sesman_SOURCES = \ scp_process.h \ sesman.c \ sesman.h \ + sesman.ini.in \ sesexec_control.c \ sesexec_control.h \ session_list.c \ @@ -52,7 +53,7 @@ SUFFIXES = .in .in: $(subst_verbose)$(SUBST_VARS) $< > $@ -dist_sesmansysconf_DATA = \ +nodist_sesmansysconf_DATA = \ sesman.ini dist_sesmansysconf_SCRIPTS = \ @@ -64,3 +65,5 @@ SUBDIRS = \ sesexec \ tools \ chansrv + +CLEANFILES = $(nodist_sesmansysconf_DATA) diff --git a/xrdp/Makefile.am b/xrdp/Makefile.am index 3e11f4eebc..4de3f23ecd 100644 --- a/xrdp/Makefile.am +++ b/xrdp/Makefile.am @@ -46,6 +46,7 @@ xrdp_SOURCES = \ lang.c \ xrdp.c \ xrdp.h \ + xrdp.ini.in \ xrdp_bitmap.c \ xrdp_bitmap_load.c \ xrdp_bitmap_common.c \ @@ -93,9 +94,11 @@ SUFFIXES = .in $(subst_verbose)$(SUBST_VARS) $< > $@ dist_xrdpsysconf_DATA = \ - xrdp.ini \ xrdp_keyboard.ini +nodist_xrdpsysconf_DATA = \ + xrdp.ini + xrdppkgdatadir=$(datadir)/xrdp dist_xrdppkgdata_DATA = \ @@ -110,3 +113,5 @@ dist_xrdppkgdata_DATA = \ sans-18.fv1 \ cursor0.cur \ cursor1.cur + +CLEANFILES = $(nodist_xrdpsysconf_DATA)