From 2e29e2640786e09b4ea18fb56b67b18bb836aa2b Mon Sep 17 00:00:00 2001 From: Stefan Ritt Date: Thu, 23 Oct 2014 10:45:47 +0200 Subject: [PATCH] Don't overwrite certificates, themes and init script during 'make install' --- Makefile | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/Makefile b/Makefile index ddafe5de..8c660758 100644 --- a/Makefile +++ b/Makefile @@ -173,18 +173,25 @@ install: $(EXECS) @$(INSTALL) -v -m 0644 scripts/*.js $(ELOGDIR)/scripts/ @echo "Installing CKeditor to $(ELOGDIR)/scripts/ckeditor" - cp -r scripts/* $(ELOGDIR)/scripts + @cp -r scripts/* $(ELOGDIR)/scripts @echo "Installing resources to $(ELOGDIR)/resources" @$(INSTALL) -m 0644 resources/* $(ELOGDIR)/resources/ - @$(INSTALL) -m 0644 ssl/* $(ELOGDIR)/ssl/ + @if [ ! -f $(ELOGDIR)/ssl/server.crt ]; then \ + $(INSTALL) -v -m 0644 ssl/server.crt $(ELOGDIR)/ssl/ ;\ + fi + @if [ ! -f $(ELOGDIR)/ssl/server.key ]; then \ + $(INSTALL) -v -m 0644 ssl/server.key $(ELOGDIR)/ssl/ ;\ + fi @echo "Installing themes to $(ELOGDIR)/themes" @$(INSTALL) -m 0644 themes/default/icons/* $(ELOGDIR)/themes/default/icons/ - @for file in `find themes/default -type f | grep -v .svn` ; \ + @for file in `find themes/default -type f | grep -v .svn` ;\ do \ - $(INSTALL) -m 0644 $$file $(ELOGDIR)/themes/default/`basename $$file` ;\ - done + if [ ! -f $(ELOGDIR)/themes/default/`basename $$file` ]; then \ + $(INSTALL) -m 0644 $$file $(ELOGDIR)/themes/default/`basename $$file` ;\ + fi; \ + done @echo "Installing example logbook to $(ELOGDIR)/logbooks/demo" @if [ ! -f $(ELOGDIR)/logbooks/demo ]; then \ @@ -193,7 +200,9 @@ install: $(EXECS) @sed "s#\@PREFIX\@#$(PREFIX)#g" elogd.init_template > elogd.init @mkdir -p -m 0755 $(RCDIR) - @$(INSTALL) -v -m 0755 elogd.init $(RCDIR)/elogd + @if [ ! -f $(RCDIR)/elogd ]; then \ + @$(INSTALL) -v -m 0755 elogd.init $(RCDIR)/elogd ; \ + fi @if [ ! -f $(ELOGDIR)/elogd.cfg ]; then \ $(INSTALL) -v -m 644 elogd.cfg $(ELOGDIR)/elogd.cfg ; \