diff --git a/instfiles/Makefile.am b/instfiles/Makefile.am index 7a16457b..f32eb639 100644 --- a/instfiles/Makefile.am +++ b/instfiles/Makefile.am @@ -36,7 +36,7 @@ if LINUX SUBDIRS += \ pam.d \ pulse -dist_startscript_DATA += xrdp.sh +dist_startscript_SCRIPTS = xrdp.sh if HAVE_SYSTEMD dist_systemdsystemunit_DATA = \ xrdp-sesman.service \ @@ -61,9 +61,7 @@ endif if LINUX # must be tab below install-data-hook: - chmod 755 $(DESTDIR)$(sysconfdir)/xrdp/xrdp.sh if [ -f $(DESTDIR)$(sysconfdir)/init.d/xrdp ]; then \ - chmod 755 $(DESTDIR)$(sysconfdir)/init.d/xrdp; \ sed -i 's|__BASE__|$(prefix)|' $(DESTDIR)$(sysconfdir)/init.d/xrdp; \ fi endif @@ -71,6 +69,5 @@ endif if FREEBSD # must be tab below install-data-hook: - chmod 755 $(DESTDIR)$(sysconfdir)/rc.d/xrdp sed -i '' 's|%%PREFIX%%|$(prefix)|g' $(DESTDIR)$(sysconfdir)/rc.d/xrdp endif diff --git a/instfiles/init.d/Makefile.am b/instfiles/init.d/Makefile.am index b76c8573..2ffff4fe 100644 --- a/instfiles/init.d/Makefile.am +++ b/instfiles/init.d/Makefile.am @@ -1,2 +1,2 @@ startscriptdir = $(sysconfdir)/init.d -dist_startscript_DATA = xrdp +dist_startscript_SCRIPTS = xrdp diff --git a/instfiles/rc.d/Makefile.am b/instfiles/rc.d/Makefile.am index 62c7d330..17993232 100644 --- a/instfiles/rc.d/Makefile.am +++ b/instfiles/rc.d/Makefile.am @@ -1,2 +1,2 @@ startscriptdir = $(sysconfdir)/rc.d -dist_startscript_DATA = xrdp +dist_startscript_SCRIPTS = xrdp diff --git a/sesman/Makefile.am b/sesman/Makefile.am index 5f22d379..68dba28e 100644 --- a/sesman/Makefile.am +++ b/sesman/Makefile.am @@ -65,7 +65,9 @@ xrdp_sesman_LDADD = \ sesmansysconfdir=$(sysconfdir)/xrdp dist_sesmansysconf_DATA = \ - sesman.ini \ + sesman.ini + +dist_sesmansysconf_SCRIPTS = \ startwm.sh SUBDIRS = \ @@ -73,7 +75,3 @@ SUBDIRS = \ tools \ sessvc \ chansrv - -# must be tab below -install-data-hook: - chmod 755 $(DESTDIR)$(sysconfdir)/xrdp/startwm.sh