X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=Makefile;fp=Makefile;h=12645dace17ddbb65fc9050ebd00aa20fb1bd179;hb=e7b3c4d7b29b79f79b766c0237c930213ab998a2;hp=853577e62d47c4919b00451734ca4ecb3d7fc5c0;hpb=6770d8ce6d50010e883cda5076c2c1e745ac6085;p=nodemanager.git

diff --git a/Makefile b/Makefile
index 853577e..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
@@ -55,9 +44,10 @@ install-miscell:
 	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