Public/elog
1
0
Fork 0
mirror of https://gitea.psi.ch/ELOG/elog.git synced 2026-09-08 17:13:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' of https://bitbucket.org/ritt/elog into develop

Browse Source
This commit is contained in:
Dario Milicic 2014-10-23 11:38:33 +02:00
commit 7232f5cd9b
1 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
Makefile
View File

@ -173,18 +173,25 @@ install: $(EXECS)
@$(INSTALL) -v -m 0644 scripts/*.js $(ELOGDIR)/scripts/ @$(INSTALL) -v -m 0644 scripts/*.js $(ELOGDIR)/scripts/
@echo "Installing CKeditor to $(ELOGDIR)/scripts/ckeditor" @echo "Installing CKeditor to $(ELOGDIR)/scripts/ckeditor"
cp -r scripts/* $(ELOGDIR)/scripts @cp -r scripts/* $(ELOGDIR)/scripts
@echo "Installing resources to $(ELOGDIR)/resources" @echo "Installing resources to $(ELOGDIR)/resources"
@$(INSTALL) -m 0644 resources/* $(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" @echo "Installing themes to $(ELOGDIR)/themes"
@$(INSTALL) -m 0644 themes/default/icons/* $(ELOGDIR)/themes/default/icons/ @$(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 \ do \
$(INSTALL) -m 0644 $$file $(ELOGDIR)/themes/default/`basename $$file` ;\ if [ ! -f $(ELOGDIR)/themes/default/`basename $$file` ]; then \
done $(INSTALL) -m 0644 $$file $(ELOGDIR)/themes/default/`basename $$file` ;\
fi; \
done
@echo "Installing example logbook to $(ELOGDIR)/logbooks/demo" @echo "Installing example logbook to $(ELOGDIR)/logbooks/demo"
@if [ ! -f $(ELOGDIR)/logbooks/demo ]; then \ @if [ ! -f $(ELOGDIR)/logbooks/demo ]; then \
@ -193,7 +200,9 @@ install: $(EXECS)
@sed "s#\@PREFIX\@#$(PREFIX)#g" elogd.init_template > elogd.init @sed "s#\@PREFIX\@#$(PREFIX)#g" elogd.init_template > elogd.init
@mkdir -p -m 0755 $(RCDIR) @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 \ @if [ ! -f $(ELOGDIR)/elogd.cfg ]; then \
$(INSTALL) -v -m 644 elogd.cfg $(ELOGDIR)/elogd.cfg ; \ $(INSTALL) -v -m 644 elogd.cfg $(ELOGDIR)/elogd.cfg ; \