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
(cherry picked from commit 19bacc6e49
)
This commit is contained in:
parent
b6407a9bf9
commit
5e95fc0cb3
@ -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)
|
||||
|
@ -53,6 +53,7 @@ xrdp_SOURCES = \
|
||||
lang.c \
|
||||
xrdp.c \
|
||||
xrdp.h \
|
||||
xrdp.ini.in \
|
||||
xrdp_bitmap.c \
|
||||
xrdp_bitmap_load.c \
|
||||
xrdp_bitmap_common.c \
|
||||
@ -102,9 +103,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 = \
|
||||
@ -119,3 +122,5 @@ dist_xrdppkgdata_DATA = \
|
||||
sans-18.fv1 \
|
||||
cursor0.cur \
|
||||
cursor1.cur
|
||||
|
||||
CLEANFILES = $(nodist_xrdpsysconf_DATA)
|
||||
|
Loading…
Reference in New Issue
Block a user