diff options
| author | jsorg71 <jay.sorg@gmail.com> | 2015-05-01 17:45:06 -0700 |
|---|---|---|
| committer | jsorg71 <jay.sorg@gmail.com> | 2015-05-01 17:45:06 -0700 |
| commit | 830a93d82409b0ee354fc1b84beab63018052db5 (patch) | |
| tree | 6df23b3bc59ba86fa6fd8c54b076b86b0c922d91 /instfiles | |
| parent | 04b729ccd1fa88de2dbc497b6cbae4428bdcc0e3 (diff) | |
| parent | 2ce05038fd2130de5d3c6703058940480872f139 (diff) | |
| download | xrdp-proprietary-830a93d82409b0ee354fc1b84beab63018052db5.tar.gz xrdp-proprietary-830a93d82409b0ee354fc1b84beab63018052db5.zip | |
Merge pull request #235 from metalefty/init-scripts-on-systemd
instfiles: init.d/xrdp shouldn't be installed on systemd system
Diffstat (limited to 'instfiles')
| -rw-r--r-- | instfiles/Makefile.am | 12 | ||||
| -rw-r--r-- | instfiles/init.d/Makefile.am | 2 |
2 files changed, 9 insertions, 5 deletions
diff --git a/instfiles/Makefile.am b/instfiles/Makefile.am index 3cda56ae..98c0e0b6 100644 --- a/instfiles/Makefile.am +++ b/instfiles/Makefile.am @@ -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 diff --git a/instfiles/init.d/Makefile.am b/instfiles/init.d/Makefile.am index ae411c20..d9e43ecb 100644 --- a/instfiles/init.d/Makefile.am +++ b/instfiles/init.d/Makefile.am @@ -1,4 +1,4 @@ EXTRA_DIST = xrdp startscriptdir=$(sysconfdir)/init.d startscript_DATA = xrdp - + |