Merge branch 'devel' of https://github.com/r-p-e/ansible into r-p-e-devel

11 years ago · 105e2f916e
parent c6fdb85d88 338ecdd578
commit 105e2f916e
1 changed files with 2 additions and 6 deletions
--- a/8
+++ b/8
@ -39,15 +39,11 @@ ifneq ($(shell which git),)
 GIT_DATE := $(shell git log -n 1 --format="%ai")
 endif

-ifeq ($(OS), FreeBSD)
-DATE := $(shell date -j -f "%Y-%m-%d %H:%M:%s"  "$(GIT_DATE)" +%Y%m%d%H%M)
-else
-ifeq ($(OS), Darwin)
-DATE := $(shell date -j -f "%Y-%m-%d %H:%M:%S"  "$(GIT_DATE)" +%Y%m%d%H%M)
+ifeq ($(shell echo $(OS) | egrep -c 'Darwin|FreeBSD|OpenBSD'),1)
+DATE := $(shell date -j -r $(shell git log -n 1 --format="%at") +%Y%m%d%H%M)
 else
 DATE := $(shell date --utc --date="$(GIT_DATE)" +%Y%m%d%H%M)
 endif
-endif

 # RPM build parameters
 RPMSPECDIR= packaging/rpm