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

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

Browse Source 
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
commit 830a93d824
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
instfiles/Makefile.am
View File

@ -4,14 +4,16 @@ xrdp.service
SUBDIRS = \ SUBDIRS = \
pam.d \ pam.d \
init.d \
default \
pulse pulse
if HAVE_SYSTEMD if HAVE_SYSTEMD
systemdsystemunit_DATA = \ systemdsystemunit_DATA = \
xrdp-sesman.service \ xrdp-sesman.service \
xrdp.service xrdp.service
else
SUBDIRS+=
default \
init.d
endif endif
startscriptdir=$(sysconfdir)/xrdp startscriptdir=$(sysconfdir)/xrdp
@ -35,5 +37,7 @@ startscript_DATA = \
# must be tab below # must be tab below
install-data-hook: install-data-hook:
chmod 755 $(DESTDIR)$(sysconfdir)/xrdp/xrdp.sh chmod 755 $(DESTDIR)$(sysconfdir)/xrdp/xrdp.sh
chmod 755 $(DESTDIR)$(sysconfdir)/init.d/xrdp if [ -f $(DESTDIR)$(sysconfdir)/init.d/xrdp ]; then \
sed -i 's|__BASE__|$(prefix)|' $(DESTDIR)$(sysconfdir)/init.d/xrdp; chmod 755 $(DESTDIR)$(sysconfdir)/init.d/xrdp; \
sed -i 's|__BASE__|$(prefix)|' $(DESTDIR)$(sysconfdir)/init.d/xrdp; \
fi