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

Use SCRIPTS for executable scripts, don't use "chmod 755"

Browse Source
This commit is contained in:
Pavel Roskin 2016-02-22 23:13:16 -08:00
parent 7642675ddf
commit 22e6f3e2f7
4 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
instfiles/Makefile.am
View File

@ -36,7 +36,7 @@ if LINUX
SUBDIRS += \ SUBDIRS += \
pam.d \ pam.d \
pulse pulse
dist_startscript_DATA += xrdp.sh dist_startscript_SCRIPTS = xrdp.sh
if HAVE_SYSTEMD if HAVE_SYSTEMD
dist_systemdsystemunit_DATA = \ dist_systemdsystemunit_DATA = \
xrdp-sesman.service \ xrdp-sesman.service \
@ -61,9 +61,7 @@ endif
if LINUX if LINUX
# must be tab below # must be tab below
install-data-hook: install-data-hook:
chmod 755 $(DESTDIR)$(sysconfdir)/xrdp/xrdp.sh
if [ -f $(DESTDIR)$(sysconfdir)/init.d/xrdp ]; then \ 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; \ sed -i 's|__BASE__|$(prefix)|' $(DESTDIR)$(sysconfdir)/init.d/xrdp; \
fi fi
endif endif
@ -71,6 +69,5 @@ endif
if FREEBSD if FREEBSD
# must be tab below # must be tab below
install-data-hook: install-data-hook:
chmod 755 $(DESTDIR)$(sysconfdir)/rc.d/xrdp
sed -i '' 's|%%PREFIX%%|$(prefix)|g' $(DESTDIR)$(sysconfdir)/rc.d/xrdp sed -i '' 's|%%PREFIX%%|$(prefix)|g' $(DESTDIR)$(sysconfdir)/rc.d/xrdp
endif endif

2
instfiles/init.d/Makefile.am
View File

@ -1,2 +1,2 @@
startscriptdir = $(sysconfdir)/init.d startscriptdir = $(sysconfdir)/init.d
dist_startscript_DATA = xrdp dist_startscript_SCRIPTS = xrdp

2
instfiles/rc.d/Makefile.am
View File

@ -1,2 +1,2 @@
startscriptdir = $(sysconfdir)/rc.d startscriptdir = $(sysconfdir)/rc.d
dist_startscript_DATA = xrdp dist_startscript_SCRIPTS = xrdp

8
sesman/Makefile.am
View File

@ -65,7 +65,9 @@ xrdp_sesman_LDADD = \
sesmansysconfdir=$(sysconfdir)/xrdp sesmansysconfdir=$(sysconfdir)/xrdp
dist_sesmansysconf_DATA = \ dist_sesmansysconf_DATA = \
sesman.ini \ sesman.ini
dist_sesmansysconf_SCRIPTS = \
startwm.sh startwm.sh
SUBDIRS = \ SUBDIRS = \
@ -73,7 +75,3 @@ SUBDIRS = \
tools \ tools \
sessvc \ sessvc \
chansrv chansrv
# must be tab below
install-data-hook:
chmod 755 $(DESTDIR)$(sysconfdir)/xrdp/startwm.sh