Skip to content

Commit

Permalink
Include {xrdp,sesman}.ini.in instead of substituted .ini in tarball
Browse files Browse the repository at this point in the history
These config files are intended to be substituted during the build
process. The substituted .ini files should not be included in release
tarballs.

Fixes:  neutrinolabs#3187
  • Loading branch information
metalefty committed Aug 1, 2024
1 parent 1c33f3d commit 19bacc6
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 2 deletions.
5 changes: 4 additions & 1 deletion sesman/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand All @@ -52,7 +53,7 @@ SUFFIXES = .in
.in:
$(subst_verbose)$(SUBST_VARS) $< > $@

dist_sesmansysconf_DATA = \
nodist_sesmansysconf_DATA = \
sesman.ini

dist_sesmansysconf_SCRIPTS = \
Expand All @@ -64,3 +65,5 @@ SUBDIRS = \
sesexec \
tools \
chansrv

CLEANFILES = $(nodist_sesmansysconf_DATA)
7 changes: 6 additions & 1 deletion xrdp/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down Expand Up @@ -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 = \
Expand All @@ -110,3 +113,5 @@ dist_xrdppkgdata_DATA = \
sans-18.fv1 \
cursor0.cur \
cursor1.cur

CLEANFILES = $(nodist_xrdpsysconf_DATA)

0 comments on commit 19bacc6

Please sign in to comment.