Merge pull request #235 from metalefty/init-scripts-on-systemd

instfiles: init.d/xrdp shouldn't be installed on systemd system
This commit is contained in:
jsorg71
2015-05-01 17:45:06 -07:00
2 changed files with 9 additions and 5 deletions
+8 -4
View File
@@ -4,14 +4,16 @@ xrdp.service
SUBDIRS = \
pam.d \
init.d \
default \
pulse
if HAVE_SYSTEMD
systemdsystemunit_DATA = \
xrdp-sesman.service \
xrdp.service
else
SUBDIRS+=
default \
init.d
endif
startscriptdir=$(sysconfdir)/xrdp
@@ -35,5 +37,7 @@ startscript_DATA = \
# must be tab below
install-data-hook:
chmod 755 $(DESTDIR)$(sysconfdir)/xrdp/xrdp.sh
chmod 755 $(DESTDIR)$(sysconfdir)/init.d/xrdp
sed -i 's|__BASE__|$(prefix)|' $(DESTDIR)$(sysconfdir)/init.d/xrdp;
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
+1 -1
View File
@@ -1,4 +1,4 @@
EXTRA_DIST = xrdp
startscriptdir=$(sysconfdir)/init.d
startscript_DATA = xrdp