Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[v0.10] Include {xrdp,sesman}.ini.in instead of substituted .ini in tarball #3188

Merged
merged 1 commit into from
Aug 1, 2024
Merged

[v0.10] Include {xrdp,sesman}.ini.in instead of substituted .ini in tarball #3188

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion sesman/Makefile.am
View file
Open in desktop
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
View file
Open in desktop
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)