diff --git a/docs/man/Makefile.am b/docs/man/Makefile.am index 507809bd..48c26559 100644 --- a/docs/man/Makefile.am +++ b/docs/man/Makefile.am @@ -1,4 +1,4 @@ -man_MANS = \ +dist_man_MANS = \ xrdp-dis.1 \ sesman.ini.5 \ xrdp.ini.5 \ @@ -14,4 +14,4 @@ man_MANS = \ noinst_man_MANS = \ xrdp-xcon.8 -EXTRA_DIST = $(man_MANS) $(noinst_man_MANS) +EXTRA_DIST = $(noinst_man_MANS) diff --git a/instfiles/Makefile.am b/instfiles/Makefile.am index 4ef77992..7a16457b 100644 --- a/instfiles/Makefile.am +++ b/instfiles/Makefile.am @@ -1,15 +1,14 @@ EXTRA_DIST = \ xrdp.sh \ xrdp-sesman.service \ - xrdp.service \ - $(startscript_DATA) + xrdp.service # # files for all platforms # startscriptdir=$(sysconfdir)/xrdp -startscript_DATA = \ +dist_startscript_DATA = \ km-0407.ini \ km-0409.ini \ km-040c.ini \ @@ -37,9 +36,9 @@ if LINUX SUBDIRS += \ pam.d \ pulse -startscript_DATA += xrdp.sh +dist_startscript_DATA += xrdp.sh if HAVE_SYSTEMD -systemdsystemunit_DATA = \ +dist_systemdsystemunit_DATA = \ xrdp-sesman.service \ xrdp.service else diff --git a/instfiles/default/Makefile.am b/instfiles/default/Makefile.am index 6a7f4f2b..f379a46d 100644 --- a/instfiles/default/Makefile.am +++ b/instfiles/default/Makefile.am @@ -1,3 +1,2 @@ -EXTRA_DIST = xrdp -startscriptdir=$(sysconfdir)/default -startscript_DATA = xrdp +startscriptdir = $(sysconfdir)/default +dist_startscript_DATA = xrdp diff --git a/instfiles/init.d/Makefile.am b/instfiles/init.d/Makefile.am index d9e43ecb..b76c8573 100644 --- a/instfiles/init.d/Makefile.am +++ b/instfiles/init.d/Makefile.am @@ -1,4 +1,2 @@ -EXTRA_DIST = xrdp -startscriptdir=$(sysconfdir)/init.d -startscript_DATA = xrdp - +startscriptdir = $(sysconfdir)/init.d +dist_startscript_DATA = xrdp diff --git a/instfiles/pulse/Makefile.am b/instfiles/pulse/Makefile.am index fcd9ee4b..72b80d10 100644 --- a/instfiles/pulse/Makefile.am +++ b/instfiles/pulse/Makefile.am @@ -1,3 +1,2 @@ -EXTRA_DIST = default.pa -pulsedir=$(sysconfdir)/xrdp/pulse -pulse_DATA = default.pa +pulsedir = $(sysconfdir)/xrdp/pulse +dist_pulse_DATA = default.pa diff --git a/instfiles/rc.d/Makefile.am b/instfiles/rc.d/Makefile.am index 5edb8ccc..62c7d330 100644 --- a/instfiles/rc.d/Makefile.am +++ b/instfiles/rc.d/Makefile.am @@ -1,4 +1,2 @@ -EXTRA_DIST = xrdp -startscriptdir=$(sysconfdir)/rc.d -startscript_DATA = xrdp - +startscriptdir = $(sysconfdir)/rc.d +dist_startscript_DATA = xrdp diff --git a/sesman/Makefile.am b/sesman/Makefile.am index c40112aa..5f22d379 100644 --- a/sesman/Makefile.am +++ b/sesman/Makefile.am @@ -1,6 +1,3 @@ - -EXTRA_DIST = sesman.ini startwm.sh - AM_CPPFLAGS = \ -DXRDP_CFG_PATH=\"${sysconfdir}/xrdp\" \ -DXRDP_SBIN_PATH=\"${sbindir}\" \ @@ -67,7 +64,7 @@ xrdp_sesman_LDADD = \ sesmansysconfdir=$(sysconfdir)/xrdp -sesmansysconf_DATA = \ +dist_sesmansysconf_DATA = \ sesman.ini \ startwm.sh diff --git a/xrdp/Makefile.am b/xrdp/Makefile.am index d9fc2a67..67ff4df8 100644 --- a/xrdp/Makefile.am +++ b/xrdp/Makefile.am @@ -1,5 +1,3 @@ -EXTRA_DIST = $(xrdpsysconf_DATA) $(xrdppkgdata_DATA) - EXTRA_INCLUDES = EXTRA_LIBS = EXTRA_FLAGS = @@ -60,13 +58,13 @@ xrdp_LDFLAGS = \ xrdpsysconfdir=$(sysconfdir)/xrdp -xrdpsysconf_DATA = \ +dist_xrdpsysconf_DATA = \ xrdp.ini \ xrdp_keyboard.ini xrdppkgdatadir=$(datadir)/xrdp -xrdppkgdata_DATA = \ +dist_xrdppkgdata_DATA = \ ad24b.bmp \ ad256.bmp \ xrdp24b.bmp \