From b97c6d6e7f62ee1897c12dac6d93de6e3012f6c1 Mon Sep 17 00:00:00 2001
From: Stefan Ritt <stefan.ritt@psi.ch>
Date: Thu, 2 Apr 2015 15:32:16 +0200
Subject: [PATCH] Fixed Makefile for RPM build

---
 .gitignore |  1 +
 Makefile   | 10 ++--------
 elog.spec  |  2 +-
 3 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/.gitignore b/.gitignore
index 5173e64a..67fdf4c9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -18,6 +18,7 @@ git-revision.h
 *.sdf
 *.suo
 *.user
+*.bak
 NT/elogd.opensdf
 vc110.idb
 elog*.exe
diff --git a/Makefile b/Makefile
index 4c7ca2c8..254bd912 100644
--- a/Makefile
+++ b/Makefile
@@ -19,8 +19,7 @@ endif
 ELOGDIR    = $(ROOT)$(PREFIX)/elog
 DESTDIR    = $(ROOT)$(PREFIX)/bin
 SDESTDIR   = $(ROOT)$(PREFIX)/sbin
-#RCDIR      = $(ROOT)/etc/rc.d/init.d
-RCDIR      = $(ROOT)/etc/init.d
+RCDIR      = $(ROOT)/etc/rc.d/init.d
 
 # flag for SSL support
 USE_SSL    = 1
@@ -216,14 +215,9 @@ ifeq ($(OSTYPE),darwin)
 	@echo The elogd service can now be started with 
 	@echo "  sudo launchctl load /Library/LaunchDaemons/ch.psi.elogd.plist"
 else
-	@if [ ! -d $(RCDIR) ]; then \
-	  echo "Directory $(RCDIR) not found, no init script installed" ; \
-	  exit 1 ; \
-	fi
-
 	@sed "s#\@PREFIX\@#$(PREFIX)#g" elogd.init_template > elogd.init
 	@if [ ! -f $(RCDIR)/elogd ]; then  \
-	  $(INSTALL) -v -m 0755 elogd.init $(RCDIR)/elogd ; \
+	  $(INSTALL) -v -m 0755 -D elogd.init $(RCDIR)/elogd ; \
 	fi
 endif
 
diff --git a/elog.spec b/elog.spec
index cac442b1..244511da 100755
--- a/elog.spec
+++ b/elog.spec
@@ -2,7 +2,7 @@
 
 Name:       elog
 Summary:    elog is a standalone electronic web logbook
-Version:    3.0.0
+Version:    3.1.0
 Release:    1
 License:    GPL
 Group:      Applications/Networking