Tha_14/toxic
1
0
Fork 0
mirror of https://github.com/Tha14/toxic.git synced 2024-11-26 22:03:27 +01:00
Code Issues Projects Releases Wiki Activity

Merge pull request #262 from Ansa89/trivial-fix

Browse Source 
Version: add revision only if git is available
This commit is contained in:
mannol 2014-10-15 14:26:54 +02:00
commit b66874b7b3
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
cfg/global_vars.mk
View File

@ -1,7 +1,11 @@
# Version # Version
TOXIC_VERSION = 0.5.2 TOXIC_VERSION = 0.5.2
REV = $(shell git rev-list HEAD --count) REV = $(shell if which git &>/dev/null ; then git rev-list HEAD --count 2>/dev/null || echo -n "error" ; else echo -n "error" ; fi)
VERSION = $(TOXIC_VERSION)_r$(REV) ifneq ($(REV), error)
VERSION = $(TOXIC_VERSION)_r$(REV)
else
VERSION = $(TOXIC_VERSION)
endif
# Project directories # Project directories
DOC_DIR = $(BASE_DIR)/doc DOC_DIR = $(BASE_DIR)/doc

3
cfg/targets/install.mk
View File

@ -20,6 +20,9 @@ install: toxic
@echo "Installing man pages" @echo "Installing man pages"
@for f in $(MANFILES) ; do \ @for f in $(MANFILES) ; do \
if [ ! -e "$$f" ]; then \
continue ;\
fi ;\
section=$(abspath $(DESTDIR)/$(MANDIR))/man`echo $$f | rev | cut -d "." -f 1` ;\ section=$(abspath $(DESTDIR)/$(MANDIR))/man`echo $$f | rev | cut -d "." -f 1` ;\
file=$$section/$$f ;\ file=$$section/$$f ;\
mkdir -p $$section ;\ mkdir -p $$section ;\