github/xrdp
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Allow to change config file (sub)directory

Browse Source 
This allows the `xrdp` part of the path `/etc/xrdp` where config files
are placed to be customizable. This change is useful when trying the
stable version and the devel version alternately.
This commit is contained in:
Koichiro Iwao
2024-12-27 10:34:16 +09:00
parent 54a6bf11d7
commit 75736f4853
28 changed files with 43 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
common/Makefile.am
+1 -1
View File
@@ -24,7 +24,7 @@ include_HEADERS = \
xrdp_sockets.h xrdp_sockets.h
AM_CPPFLAGS = \ AM_CPPFLAGS = \
-DXRDP_CFG_PATH=\"${sysconfdir}/xrdp\" \ -DXRDP_CFG_PATH=\"${sysconfdir}/${sysconfsubdir}\" \
-DXRDP_SBIN_PATH=\"${sbindir}\" \ -DXRDP_SBIN_PATH=\"${sbindir}\" \
-DXRDP_SHARE_PATH=\"${datadir}/xrdp\" \ -DXRDP_SHARE_PATH=\"${datadir}/xrdp\" \
-DXRDP_PID_PATH=\"${localstatedir}/run\" \ -DXRDP_PID_PATH=\"${localstatedir}/run\" \
configure.ac
+7
View File
@@ -610,6 +610,12 @@ AC_ARG_WITH([pamconfdir],
[], [with_pamconfdir="$sysconfdir/pam.d"]) [], [with_pamconfdir="$sysconfdir/pam.d"])
AC_SUBST([pamconfdir], [$with_pamconfdir]) AC_SUBST([pamconfdir], [$with_pamconfdir])
AC_ARG_WITH([sysconfsubdir],
[AS_HELP_STRING([--with-sysconfsubdir=DIR],
[Use subdirectory for config files (default: xrdp)]))],
[], [with_sysconfsubdir="xrdp"])
AC_SUBST([sysconfsubdir], [$with_sysconfsubdir])
PKG_INSTALLDIR PKG_INSTALLDIR
AC_CHECK_HEADERS([sys/prctl.h uchar.h]) AC_CHECK_HEADERS([sys/prctl.h uchar.h])
@@ -704,6 +710,7 @@ echo " exec_prefix $exec_prefix"
echo " libdir $libdir" echo " libdir $libdir"
echo " bindir $bindir" echo " bindir $bindir"
echo " sysconfdir $sysconfdir" echo " sysconfdir $sysconfdir"
echo " sysconfdir+subdir $sysconfdir/$sysconfsubdir"
echo " pamconfdir $pamconfdir" echo " pamconfdir $pamconfdir"
echo " localstatedir $localstatedir" echo " localstatedir $localstatedir"
echo " runstatedir $runstatedir" echo " runstatedir $runstatedir"
docs/man/Makefile.am
+1
View File
@@ -24,6 +24,7 @@ SUBST_VARS = sed \
-e 's|@sbindir[@]|$(sbindir)|g' \ -e 's|@sbindir[@]|$(sbindir)|g' \
-e 's|@localstatedir[@]|$(localstatedir)|g' \ -e 's|@localstatedir[@]|$(localstatedir)|g' \
-e 's|@sysconfdir[@]|$(sysconfdir)|g' \ -e 's|@sysconfdir[@]|$(sysconfdir)|g' \
-e 's|@sysconfsubdir[@]|$(sysconfsubdir)|g' \
-e 's|@socketdir[@]|$(socketdir)|g' \ -e 's|@socketdir[@]|$(socketdir)|g' \
-e 's|@xrdpconfdir[@]|$(sysconfdir)/xrdp|g' \ -e 's|@xrdpconfdir[@]|$(sysconfdir)/xrdp|g' \
-e 's|@xrdpdatadir[@]|$(datadir)/xrdp|g' \ -e 's|@xrdpdatadir[@]|$(datadir)/xrdp|g' \
docs/man/sesman.ini.5.in
+1 -1
View File
@@ -440,7 +440,7 @@ All entries in the \fB[SessionVariables]\fR section are set as
environment variables in the user's session. environment variables in the user's session.
.SH "FILES" .SH "FILES"
@sysconfdir@/xrdp/sesman.ini @sysconfdir@/@sysconfsubdir@/sesman.ini
.SH "SEE ALSO" .SH "SEE ALSO"
.BR xrdp-sesman (8), .BR xrdp-sesman (8),
docs/man/xrdp-chansrv.8.in
+1 -1
View File
@@ -40,7 +40,7 @@ X11 display number. Must be specified.
.SH FILES .SH FILES
.TP .TP
.I @sysconfdir@/xrdp/sesman.ini .I @sysconfdir@/@sysconfsubdir@/sesman.ini
Contains some settings for this program. Contains some settings for this program.
.TP .TP
.I @socketdir@/xrdp_chansrv_socket_* .I @socketdir@/xrdp_chansrv_socket_*
docs/man/xrdp-genkeymap.8.in
+1 -1
View File
@@ -41,7 +41,7 @@ The key map information is stored in the file named \fIoutfile\fP.
.SH "FILES" .SH "FILES"
.TP .TP
.I @sysconfdir@/xrdp/km-XXXXXXXX.toml .I @sysconfdir@/@sysconfsubdir@/km-XXXXXXXX.toml
Files containing the keyboard mapping for country and language \fIXXXXXXXX\fP. Files containing the keyboard mapping for country and language \fIXXXXXXXX\fP.
\fIXXXXXXXX\fP is a 8 digit hexadecimal number, representing the \fIinput \fIXXXXXXXX\fP is a 8 digit hexadecimal number, representing the \fIinput
locale identifier\fP. locale identifier\fP.
docs/man/xrdp-keygen.8.in
+3 -3
View File
@@ -15,7 +15,7 @@ xrdp\-keygen \- xrdp RSA key generation utility
.SH DESCRIPTION .SH DESCRIPTION
\fBxrdp\-keygen\fP generates the file \fBxrdp\-keygen\fP generates the file
.I @sysconfdir@/xrdp/rsakeys.ini .I @sysconfdir@/@sysconfsubdir@/rsakeys.ini
which contains the RSA key pair used to perform authentication to which contains the RSA key pair used to perform authentication to
remote clients. The public key is self-signed. remote clients. The public key is self-signed.
@@ -26,14 +26,14 @@ This program takes one of the following options:
Generate a new key pair. Generate a new key pair.
The key data is stored in the file named \fIoutfile\fP. The key data is stored in the file named \fIoutfile\fP.
.br .br
If \fBauto\fP is used as \fIoutfile\fP, the default file \fI@sysconfdir@/xrdp/rsakeys.ini\fP gets created if it does not yet exists. If \fBauto\fP is used as \fIoutfile\fP, the default file \fI@sysconfdir@/@sysconfsubdir@/rsakeys.ini\fP gets created if it does not yet exists.
.TP .TP
.B test .B test
Generate a test key pair and print information to standard output. Generate a test key pair and print information to standard output.
.SH FILES .SH FILES
.TP .TP
.I @sysconfdir@/xrdp/rsakeys.ini .I @sysconfdir@/@sysconfsubdir@/rsakeys.ini
RSA public and private key pair used to identify this XRDP server. RSA public and private key pair used to identify this XRDP server.
.SH SEE ALSO .SH SEE ALSO
docs/man/xrdp-km.toml.5.in
+1 -1
View File
@@ -4,7 +4,7 @@
\fBxrdp-km.toml\fR \- \fBxrdp\fP key mapping file \fBxrdp-km.toml\fR \- \fBxrdp\fP key mapping file
.SH "DESCRIPTION" .SH "DESCRIPTION"
Key mapping files are located at \fB@sysconfdir@/xrdp/km-XXXXXXXX.toml\fP Key mapping files are located at \fB@sysconfdir@/@sysconfsubdir@/km-XXXXXXXX.toml\fP
where \fBXXXXXXXX\fP is the input locale identifier sent by the RDP client. where \fBXXXXXXXX\fP is the input locale identifier sent by the RDP client.
The key mapping files are used to translate RDP scan codes into one of The key mapping files are used to translate RDP scan codes into one of
docs/man/xrdp-sesman.8.in
+2 -2
View File
@@ -50,7 +50,7 @@ to be used primarily for testing or for unusual configurations.
.P .P
.RS .RS
If you use this option, be aware that you will have to have a If you use this option, be aware that you will have to have a
\fB@sysconfdir@/xrdp/sesman.ini\fR in place too, as a few elements of \fB@sysconfdir@/@sysconfsubdir@/sesman.ini\fR in place too, as a few elements of
the system (notably \fBxrdp(8)\fR and \fBxrdp\-chansrv(8)\fR) will want the system (notably \fBxrdp(8)\fR and \fBxrdp\-chansrv(8)\fR) will want
to read it. to read it.
.RE .RE
@@ -64,7 +64,7 @@ not running \fBxrdp\-sesman\fR as a daemon.
.br .br
@bindir@/xrdp\-sesrun @bindir@/xrdp\-sesrun
.br .br
@sysconfdir@/xrdp/sesman.ini @sysconfdir@/sysconfsubdir@/sesman.ini
.br .br
@localstatedir@/log/xrdp\-sesman.log @localstatedir@/log/xrdp\-sesman.log
.br .br
docs/man/xrdp-sesrun.8.in
+1 -1
View File
@@ -90,7 +90,7 @@ first. The \fBgnome\-terminal\fR utility probably won't work here.
.br .br
@bindir@/xrdp\-sesrun @bindir@/xrdp\-sesrun
.br .br
@sysconfdir@/xrdp/sesman.ini @sysconfdir@/@sysconfsubdir@/sesman.ini
.SH "AUTHORS" .SH "AUTHORS"
Jay Sorg <jsorg71@users.sourceforge.net> Jay Sorg <jsorg71@users.sourceforge.net>
docs/man/xrdp.8.in
+1 -1
View File
@@ -57,7 +57,7 @@ to be used primarily for testing or for unusual configurations.
.SH "FILES" .SH "FILES"
@sbindir@/xrdp @sbindir@/xrdp
.br .br
@sysconfdir@/xrdp/xrdp.ini @sysconfdir@/@sysconfsubdir@/xrdp.ini
.br .br
@localstatedir@/log/xrdp.log @localstatedir@/log/xrdp.log
.br .br
docs/man/xrdp.ini.5.in
+2 -2
View File
@@ -50,7 +50,7 @@ If set to \fB1\fR, \fBtrue\fR or \fByes\fR this option enables compression of bu
.TP .TP
\fBkey_file\fP=\fI/path/to/private_key\fP \fBkey_file\fP=\fI/path/to/private_key\fP
Set location of TLS certificate and private key. They must be written in PEM format. Set location of TLS certificate and private key. They must be written in PEM format.
If not specified, defaults to \fB@sysconfdir@/xrdp/cert.pem\fP, \fB@sysconfdir@/xrdp/key.pem\fP. If not specified, defaults to \fB@sysconfdir@/@sysconfsubdir@/cert.pem\fP, \fB@sysconfdir@/@sysconfsubdir@/key.pem\fP.
This parameter is effective only if \fBsecurity_layer\fP is set to \fBtls\fP or \fBnegotiate\fP. This parameter is effective only if \fBsecurity_layer\fP is set to \fBtls\fP or \fBnegotiate\fP.
@@ -425,7 +425,7 @@ password={base64}cGFzc3dvcmQhCg==
.fi .fi
.SH "FILES" .SH "FILES"
@sysconfdir@/xrdp/xrdp.ini @sysconfdir@/@sysconfsubdir@/xrdp.ini
.SH "SEE ALSO" .SH "SEE ALSO"
.BR xrdp (8), .BR xrdp (8),
instfiles/Makefile.am
+2 -1
View File
@@ -13,6 +13,7 @@ CLEANFILES= \
SUBST_VARS = sed \ SUBST_VARS = sed \
-e 's|@sbindir[@]|$(sbindir)|g' \ -e 's|@sbindir[@]|$(sbindir)|g' \
-e 's|@sysconfdir[@]|$(sysconfdir)|g' \ -e 's|@sysconfdir[@]|$(sysconfdir)|g' \
-e 's|@sysconfsubdir[@]|$(sysconfsubdir)|g' \
-e 's|@localstatedir[@]|$(localstatedir)|g' -e 's|@localstatedir[@]|$(localstatedir)|g'
subst_verbose = $(subst_verbose_@AM_V@) subst_verbose = $(subst_verbose_@AM_V@)
@@ -26,7 +27,7 @@ SUFFIXES = .in
# #
# files for all platforms # files for all platforms
# #
startscriptdir=$(sysconfdir)/xrdp startscriptdir=$(sysconfdir)/$(sysconfsubdir)
dist_startscript_DATA = \ dist_startscript_DATA = \
km-00000406.toml \ km-00000406.toml \
instfiles/pulse/Makefile.am
+1 -1
View File
@@ -1,2 +1,2 @@
pulsedir = $(sysconfdir)/xrdp/pulse pulsedir = $(sysconfdir)/$(sysconfsubdir)/pulse
dist_pulse_DATA = default.pa dist_pulse_DATA = default.pa
keygen/Makefile.am
+2 -2
View File
@@ -1,7 +1,7 @@
EXTRA_DIST = openssl.conf EXTRA_DIST = openssl.conf
AM_CPPFLAGS = \ AM_CPPFLAGS = \
-DXRDP_CFG_PATH=\"${sysconfdir}/xrdp\" \ -DXRDP_CFG_PATH=\"${sysconfdir}/${sysconfsubdir}\" \
-DXRDP_SBIN_PATH=\"${sbindir}\" \ -DXRDP_SBIN_PATH=\"${sbindir}\" \
-DXRDP_SHARE_PATH=\"${datadir}/xrdp\" \ -DXRDP_SHARE_PATH=\"${datadir}/xrdp\" \
-DXRDP_PID_PATH=\"${localstatedir}/run\" \ -DXRDP_PID_PATH=\"${localstatedir}/run\" \
@@ -15,7 +15,7 @@ xrdp_keygen_SOURCES = keygen.c
xrdp_keygen_LDADD = \ xrdp_keygen_LDADD = \
$(top_builddir)/common/libcommon.la $(top_builddir)/common/libcommon.la
xrdpsysconfdir = $(sysconfdir)/xrdp xrdpsysconfdir = $(sysconfdir)/$(sysconfsubdir)
install-data-hook: install-data-hook:
umask 077 && \ umask 077 && \
libxrdp/Makefile.am
+1 -1
View File
@@ -2,7 +2,7 @@ EXTRA_DIST = \
xrdp_surface.c xrdp_surface.c
AM_CPPFLAGS = \ AM_CPPFLAGS = \
-DXRDP_CFG_PATH=\"${sysconfdir}/xrdp\" \ -DXRDP_CFG_PATH=\"${sysconfdir}/${sysconfsubdir}\" \
-DXRDP_SBIN_PATH=\"${sbindir}\" \ -DXRDP_SBIN_PATH=\"${sbindir}\" \
-DXRDP_SHARE_PATH=\"${datadir}/xrdp\" \ -DXRDP_SHARE_PATH=\"${datadir}/xrdp\" \
-DXRDP_PID_PATH=\"${localstatedir}/run\" \ -DXRDP_PID_PATH=\"${localstatedir}/run\" \
mc/Makefile.am
+1 -1
View File
@@ -1,5 +1,5 @@
AM_CPPFLAGS = \ AM_CPPFLAGS = \
-DXRDP_CFG_PATH=\"${sysconfdir}/xrdp\" \ -DXRDP_CFG_PATH=\"${sysconfdir}/${sysconfsubdir}\" \
-DXRDP_SBIN_PATH=\"${sbindir}\" \ -DXRDP_SBIN_PATH=\"${sbindir}\" \
-DXRDP_SHARE_PATH=\"${datadir}/xrdp\" \ -DXRDP_SHARE_PATH=\"${datadir}/xrdp\" \
-DXRDP_PID_PATH=\"${localstatedir}/run\" \ -DXRDP_PID_PATH=\"${localstatedir}/run\" \
neutrinordp/Makefile.am
+1 -1
View File
@@ -1,5 +1,5 @@
AM_CPPFLAGS = \ AM_CPPFLAGS = \
-DXRDP_CFG_PATH=\"${sysconfdir}/xrdp\" \ -DXRDP_CFG_PATH=\"${sysconfdir}/${sysconfsubdir}\" \
-DXRDP_SBIN_PATH=\"${sbindir}\" \ -DXRDP_SBIN_PATH=\"${sbindir}\" \
-DXRDP_SHARE_PATH=\"${datadir}/xrdp\" \ -DXRDP_SHARE_PATH=\"${datadir}/xrdp\" \
-DXRDP_PID_PATH=\"${localstatedir}/run\" \ -DXRDP_PID_PATH=\"${localstatedir}/run\" \
sesman/Makefile.am
+2 -2
View File
@@ -2,7 +2,7 @@ EXTRA_DIST = \
Doxyfile Doxyfile
AM_CPPFLAGS = \ AM_CPPFLAGS = \
-DXRDP_CFG_PATH=\"${sysconfdir}/xrdp\" \ -DXRDP_CFG_PATH=\"${sysconfdir}/${sysconfsubdir}\" \
-DXRDP_SBIN_PATH=\"${sbindir}\" \ -DXRDP_SBIN_PATH=\"${sbindir}\" \
-DXRDP_LIBEXEC_PATH=\"${libexecdir}/xrdp\" \ -DXRDP_LIBEXEC_PATH=\"${libexecdir}/xrdp\" \
-DXRDP_PID_PATH=\"${localstatedir}/run\" \ -DXRDP_PID_PATH=\"${localstatedir}/run\" \
@@ -40,7 +40,7 @@ xrdp_sesman_LDADD = \
$(top_builddir)/libipm/libipm.la \ $(top_builddir)/libipm/libipm.la \
$(top_builddir)/common/libcommon.la $(top_builddir)/common/libcommon.la
sesmansysconfdir=$(sysconfdir)/xrdp sesmansysconfdir=$(sysconfdir)/$(sysconfsubdir)
SUBST_VARS = sed \ SUBST_VARS = sed \
-e 's|@sesmansysconfdir[@]|$(sesmansysconfdir)|g' -e 's|@sesmansysconfdir[@]|$(sesmansysconfdir)|g'
sesman/chansrv/Makefile.am
+1 -1
View File
@@ -4,7 +4,7 @@ EXTRA_DIST = \
wave-format-server.txt wave-format-server.txt
AM_CPPFLAGS = \ AM_CPPFLAGS = \
-DXRDP_CFG_PATH=\"${sysconfdir}/xrdp\" \ -DXRDP_CFG_PATH=\"${sysconfdir}/${sysconfsubdir}\" \
-DXRDP_SBIN_PATH=\"${sbindir}\" \ -DXRDP_SBIN_PATH=\"${sbindir}\" \
-DXRDP_SHARE_PATH=\"${datadir}/xrdp\" \ -DXRDP_SHARE_PATH=\"${datadir}/xrdp\" \
-DXRDP_PID_PATH=\"${localstatedir}/run\" \ -DXRDP_PID_PATH=\"${localstatedir}/run\" \
sesman/libsesman/Makefile.am
+1 -1
View File
@@ -3,7 +3,7 @@
AM_CPPFLAGS = \ AM_CPPFLAGS = \
-DXRDP_PAMCONF_PATH=\"${pamconfdir}\" \ -DXRDP_PAMCONF_PATH=\"${pamconfdir}\" \
-DXRDP_CFG_PATH=\"${sysconfdir}/xrdp\" \ -DXRDP_CFG_PATH=\"${sysconfdir}/${sysconfsubdir}\" \
-DXRDP_SOCKET_ROOT_PATH=\"${socketdir}\" \ -DXRDP_SOCKET_ROOT_PATH=\"${socketdir}\" \
-I$(top_srcdir)/libipm \ -I$(top_srcdir)/libipm \
-I$(top_srcdir)/common -I$(top_srcdir)/common
sesman/sesexec/Makefile.am
+1 -1
View File
@@ -1,5 +1,5 @@
AM_CPPFLAGS = \ AM_CPPFLAGS = \
-DXRDP_CFG_PATH=\"${sysconfdir}/xrdp\" \ -DXRDP_CFG_PATH=\"${sysconfdir}/${sysconfsubdir}\" \
-DXRDP_SBIN_PATH=\"${sbindir}\" \ -DXRDP_SBIN_PATH=\"${sbindir}\" \
-DXRDP_LIBEXEC_PATH=\"${libexecdir}/xrdp\" \ -DXRDP_LIBEXEC_PATH=\"${libexecdir}/xrdp\" \
-DXRDP_SOCKET_ROOT_PATH=\"${socketdir}\" \ -DXRDP_SOCKET_ROOT_PATH=\"${socketdir}\" \
sesman/tools/Makefile.am
+1 -1
View File
@@ -1,5 +1,5 @@
AM_CPPFLAGS = \ AM_CPPFLAGS = \
-DXRDP_CFG_PATH=\"${sysconfdir}/xrdp\" \ -DXRDP_CFG_PATH=\"${sysconfdir}/${sysconfsubdir}\" \
-DXRDP_SOCKET_ROOT_PATH=\"${socketdir}\" \ -DXRDP_SOCKET_ROOT_PATH=\"${socketdir}\" \
-I$(top_srcdir)/sesman/libsesman \ -I$(top_srcdir)/sesman/libsesman \
-I$(top_srcdir)/common \ -I$(top_srcdir)/common \
tools/chkpriv/Makefile.am
+2 -1
View File
@@ -21,7 +21,8 @@ xrdp_droppriv_LDADD = \
SUBST_VARS = sed \ SUBST_VARS = sed \
-e 's|@pkglibexecdir[@]|$(pkglibexecdir)|g' \ -e 's|@pkglibexecdir[@]|$(pkglibexecdir)|g' \
-e 's|@sysconfdir[@]|$(sysconfdir)|g' -e 's|@sysconfdir[@]|$(sysconfdir)|g' \
-e 's|@sysconfsubdir[@]|$(sysconfsubdir)|g'
subst_verbose = $(subst_verbose_@AM_V@) subst_verbose = $(subst_verbose_@AM_V@)
subst_verbose_ = $(subst_verbose_@AM_DEFAULT_V@) subst_verbose_ = $(subst_verbose_@AM_DEFAULT_V@)
tools/chkpriv/xrdp-chkpriv.in
+1 -1
View File
@@ -20,7 +20,7 @@
# mode # mode
# Change these if they do not match your installation # Change these if they do not match your installation
CONF_DIR=@sysconfdir@/xrdp CONF_DIR=@sysconfdir@/@sysconfsubdir@
XRDP_INI="$CONF_DIR"/xrdp.ini XRDP_INI="$CONF_DIR"/xrdp.ini
SESMAN_INI="$CONF_DIR"/sesman.ini SESMAN_INI="$CONF_DIR"/sesman.ini
RSAKEYS_INI="$CONF_DIR"/rsakeys.ini RSAKEYS_INI="$CONF_DIR"/rsakeys.ini
vnc/Makefile.am
+1 -1
View File
@@ -1,5 +1,5 @@
AM_CPPFLAGS = \ AM_CPPFLAGS = \
-DXRDP_CFG_PATH=\"${sysconfdir}/xrdp\" \ -DXRDP_CFG_PATH=\"${sysconfdir}/${sysconfsubdir}\" \
-DXRDP_SBIN_PATH=\"${sbindir}\" \ -DXRDP_SBIN_PATH=\"${sbindir}\" \
-DXRDP_SHARE_PATH=\"${datadir}/xrdp\" \ -DXRDP_SHARE_PATH=\"${datadir}/xrdp\" \
-DXRDP_PID_PATH=\"${localstatedir}/run\" \ -DXRDP_PID_PATH=\"${localstatedir}/run\" \
xrdp/Makefile.am
+2 -2
View File
@@ -4,7 +4,7 @@ EXTRA_DIST = \
xrdpwin.c xrdpwin.c
AM_CPPFLAGS = \ AM_CPPFLAGS = \
-DXRDP_CFG_PATH=\"${sysconfdir}/xrdp\" \ -DXRDP_CFG_PATH=\"${sysconfdir}/${sysconfsubdir}\" \
-DXRDP_SBIN_PATH=\"${sbindir}\" \ -DXRDP_SBIN_PATH=\"${sbindir}\" \
-DXRDP_SHARE_PATH=\"${datadir}/xrdp\" \ -DXRDP_SHARE_PATH=\"${datadir}/xrdp\" \
-DXRDP_PID_PATH=\"${localstatedir}/run\" \ -DXRDP_PID_PATH=\"${localstatedir}/run\" \
@@ -92,7 +92,7 @@ xrdp_LDADD = \
$(IMLIB2_LIBS) \ $(IMLIB2_LIBS) \
$(XRDP_EXTRA_LIBS) $(XRDP_EXTRA_LIBS)
xrdpsysconfdir=$(sysconfdir)/xrdp xrdpsysconfdir=$(sysconfdir)/$(sysconfsubdir)
if MACOS if MACOS
lib_extension = dylib lib_extension = dylib
xup/Makefile.am
+1 -1
View File
@@ -1,5 +1,5 @@
AM_CPPFLAGS = \ AM_CPPFLAGS = \
-DXRDP_CFG_PATH=\"${sysconfdir}/xrdp\" \ -DXRDP_CFG_PATH=\"${sysconfdir}/${sysconfsubdir}\" \
-DXRDP_SBIN_PATH=\"${sbindir}\" \ -DXRDP_SBIN_PATH=\"${sbindir}\" \
-DXRDP_SHARE_PATH=\"${datadir}/xrdp\" \ -DXRDP_SHARE_PATH=\"${datadir}/xrdp\" \
-DXRDP_PID_PATH=\"${localstatedir}/run\" \ -DXRDP_PID_PATH=\"${localstatedir}/run\" \