X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=Makefile;h=12645dace17ddbb65fc9050ebd00aa20fb1bd179;hb=38340f784c7178599e559e8ac3fa04e3880e8a7a;hp=95e01ace045ff19e82c14693892ca57a452b11fc;hpb=7f20c8e49eeeead8f0792030bb44c5e94d50be42;p=nodemanager.git

diff --git a/Makefile b/Makefile
index 95e01ac..12645da 100644
--- a/Makefile
+++ b/Makefile
@@ -9,20 +9,9 @@
 # autoconf compatible variables
 datadir := /usr/share
 bindir := /usr/bin
-initdir=/etc/init.d
-systemddir := /usr/lib/systemd/system
-
-####################
 # call with either WITH_SYSTEMD=true or WITH_INIT=true
-ifneq "$(WITH_SYSTEMD)" ""
-use_sytemd=true
-else
-ifneq "$(WITH_INIT)" ""
-use_systemd=""
-else # if not set then try to guess
-use_systemd=$(bash -c 'type -p systemctl')
-endif
-endif
+initdir=/etc/rc.d/init.d
+systemddir := /usr/lib/systemd/system
 
 ####################
 lib: forward_api_calls
@@ -52,12 +41,13 @@ install-miscell:
 	install -D -m 644 logrotate/nodemanager $(DESTDIR)/etc/logrotate.d/nodemanager
 	install -D -m 755 sshsh $(DESTDIR)/bin/sshsh
 	mkdir -p $(DESTDIR)/$(datadir)/NodeManager/sliver-initscripts
-	rsync -av sliver-initscripts/ $(DESTDIR)/$(datadir)/sliver-initscripts/
-	chmod 755 $(DESTDIR)/$(datadir)/sliver-initscripts/
+	rsync -av sliver-initscripts/ $(DESTDIR)/$(datadir)/NodeManager/sliver-initscripts/
+	chmod 755 $(DESTDIR)/$(datadir)/NodeManager/sliver-initscripts/
 
-ifneq "$use_systemd" ""
+ifneq "$(WITH_SYSTEMD)" ""
 install-startup: install-systemd
-else
+endif
+ifneq "$(WITH_INIT)" ""
 install-startup: install-init
 endif