5 files changed, 12 insertions, 19 deletions
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