From: Thierry Parmentelat <thierry.parmentelat@inria.fr>
Date: Thu, 16 Jan 2014 13:15:29 +0000 (+0100)
Subject: fixes
X-Git-Tag: nodemanager-5.2-10~6^2~9^2~5
X-Git-Url: http://git.onelab.eu/?p=nodemanager.git;a=commitdiff_plain;h=7f20c8e49eeeead8f0792030bb44c5e94d50be42

fixes
---

diff --git a/Makefile b/Makefile
index 694ae92..95e01ac 100644
--- a/Makefile
+++ b/Makefile
@@ -47,8 +47,8 @@ install-lib: install-miscell install-startup
 
 # might be better in setup.py ?
 install-miscell:
-	install -m 444 README $(DESTDIR)/$(datadir)/NodeManager
 	install -d -m 755 $(DESTDIR)/var/lib/nodemanager
+	install -D -m 444 README $(DESTDIR)/$(datadir)/NodeManager/README
 	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
diff --git a/nodemanager-lib.spec b/nodemanager-lib.spec
index 90a2dc6..dfa2f70 100644
--- a/nodemanager-lib.spec
+++ b/nodemanager-lib.spec
@@ -47,9 +47,9 @@ either nodemanager-vs or nodemanager-lxc
 
 # use initscripts or systemd unit files to start installed services
 %if "%{distro}" == "Fedora" && %{distrorelease} >= 18
-%define make_options=WITH_SYSTEMD=true
+%define make_options WITH_SYSTEMD=true
 %else
-%define make_options=WITH_INIT=true
+%define make_options WITH_INIT=true
 %endif
 
 %prep