Merge pull request #3189 from metalefty/tarball

Include {xrdp,sesman}.ini.in instead of substituted .ini in tarball
This commit is contained in:
metalefty 2024-08-01 21:17:43 +09:00 committed by GitHub
commit f1d3b21177
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 10 additions and 2 deletions

View File

@ -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)

View File

@ -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)