Fixed Makefile for RPM build

This commit is contained in:
Stefan Ritt 2015-04-02 15:32:16 +02:00
parent c701f01f02
commit b97c6d6e7f
3 changed files with 4 additions and 9 deletions

1
.gitignore vendored
View File

@ -18,6 +18,7 @@ git-revision.h
*.sdf *.sdf
*.suo *.suo
*.user *.user
*.bak
NT/elogd.opensdf NT/elogd.opensdf
vc110.idb vc110.idb
elog*.exe elog*.exe

View File

@ -19,8 +19,7 @@ endif
ELOGDIR = $(ROOT)$(PREFIX)/elog ELOGDIR = $(ROOT)$(PREFIX)/elog
DESTDIR = $(ROOT)$(PREFIX)/bin DESTDIR = $(ROOT)$(PREFIX)/bin
SDESTDIR = $(ROOT)$(PREFIX)/sbin SDESTDIR = $(ROOT)$(PREFIX)/sbin
#RCDIR = $(ROOT)/etc/rc.d/init.d RCDIR = $(ROOT)/etc/rc.d/init.d
RCDIR = $(ROOT)/etc/init.d
# flag for SSL support # flag for SSL support
USE_SSL = 1 USE_SSL = 1
@ -216,14 +215,9 @@ ifeq ($(OSTYPE),darwin)
@echo The elogd service can now be started with @echo The elogd service can now be started with
@echo " sudo launchctl load /Library/LaunchDaemons/ch.psi.elogd.plist" @echo " sudo launchctl load /Library/LaunchDaemons/ch.psi.elogd.plist"
else 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 @sed "s#\@PREFIX\@#$(PREFIX)#g" elogd.init_template > elogd.init
@if [ ! -f $(RCDIR)/elogd ]; then \ @if [ ! -f $(RCDIR)/elogd ]; then \
$(INSTALL) -v -m 0755 elogd.init $(RCDIR)/elogd ; \ $(INSTALL) -v -m 0755 -D elogd.init $(RCDIR)/elogd ; \
fi fi
endif endif

View File

@ -2,7 +2,7 @@
Name: elog Name: elog
Summary: elog is a standalone electronic web logbook Summary: elog is a standalone electronic web logbook
Version: 3.0.0 Version: 3.1.0
Release: 1 Release: 1
License: GPL License: GPL
Group: Applications/Networking Group: Applications/Networking