From bf3e10a47833054f052972cb53424905b38d86a0 Mon Sep 17 00:00:00 2001
From: Stefan Ritt <stefan.ritt@psi.ch>
Date: Mon, 6 Mar 2006 19:32:30 +0000
Subject: [PATCH] Changed install program

SVN revision: 1673
---
 Makefile  | 8 ++++----
 elog.spec | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Makefile b/Makefile
index 8b1e2d84..f769ffd6 100644
--- a/Makefile
+++ b/Makefile
@@ -34,7 +34,7 @@ MXMLDIR = ../mxml
 BINOWNER = bin
 BINGROUP = bin
 
-INSTALL = /usr/bin/install
+INSTALL = `which install`
 RM = /bin/rm -f
 
 OSTYPE = $(shell uname)
@@ -121,19 +121,19 @@ install: $(EXECS)
 	@$(INSTALL) -m 0644 themes/default/icons/* $(ELOGDIR)/themes/default/icons/
 	@for file in `find themes/default -type f | grep -v .svn` ; \
           do \
-          install -D -m 0644 $$file $(ELOGDIR)/themes/default/`basename $$file` ;\
+          $(INSTALL) -D -m 0644 $$file $(ELOGDIR)/themes/default/`basename $$file` ;\
           done
 
 	@echo "Installing example logbook to $(ELOGDIR)/logbooks/demo"	
 	@if [ ! -f $(ELOGDIR)/logbooks/demo ]; then  \
-	  install -v -m 0644 logbooks/demo/* $(ELOGDIR)/logbooks/demo ; \
+	  $(INSTALL) -v -m 0644 logbooks/demo/* $(ELOGDIR)/logbooks/demo ; \
 	fi
 
 	@sed "s#\@PREFIX\@#$(PREFIX)#g" elogd.init_template > elogd.init
 	@$(INSTALL) -v -D -m 0755 elogd.init $(RCDIR)/elogd
 
 	@if [ ! -f $(ELOGDIR)/elogd.cfg ]; then  \
-	  install -v -m 644 elogd.cfg $(ELOGDIR)/elogd.cfg ; \
+	  $(INSTALL) -v -m 644 elogd.cfg $(ELOGDIR)/elogd.cfg ; \
 	fi
 
 restart:
diff --git a/elog.spec b/elog.spec
index 88ae4edf..2d19fbb8 100755
--- a/elog.spec
+++ b/elog.spec
@@ -3,7 +3,7 @@
 Name:       elog
 Summary:    elog is a standalone electronic web logbook
 Version:    2.6.1
-Release:    1
+Release:    3
 Copyright:  GPL
 Group:      Applications/Networking
 Source:     http://midas.psi.ch/elog/download/elog-%{version}.tar.gz