Skip to content

A
ansible
Commit e039d884 by Michael DeHaan
Options

Merge pull request #1061 from copperlight/fix-make-error 

fix Makefile date command error on OSX
parents b2af95e4 5072ed3b
Showing with 4 additions and 0 deletions
Makefile
...@@ -37,8 +37,12 @@ endif ...@@ -37,8 +37,12 @@ endif
ifeq ($(OS), FreeBSD) ifeq ($(OS), FreeBSD)
DATE := $(shell date -j -f "%Y-%m-%d %H:%M:%s" "$(GIT_DATE)" +%Y%m%d%H%M) DATE := $(shell date -j -f "%Y-%m-%d %H:%M:%s" "$(GIT_DATE)" +%Y%m%d%H%M)
else else
ifeq ($(OS), Darwin)
DATE := $(shell date -j -f "%Y-%m-%d %H:%M:%S" "$(GIT_DATE)" +%Y%m%d%H%M)
else
DATE := $(shell date --date="$(GIT_DATE)" +%Y%m%d%H%M) DATE := $(shell date --date="$(GIT_DATE)" +%Y%m%d%H%M)
endif endif
endif
# RPM build parameters # RPM build parameters
RPMSPECDIR= packaging/rpm RPMSPECDIR= packaging/rpm
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment