- Makefile now works with freebsd (date command options are diff)

date still issues warning and ignores TZ

- Updated tests to work inside bsd jails (127 addresses are an issue)
Signed-off-by: Brian Coca <briancoca+ansible@gmail.com>
This commit is contained in:
Brian Coca
2012-08-27 23:06:39 -04:00
parent 00c4c5c4a1
commit 83d1028a21
5 changed files with 13 additions and 7 deletions

View File

@@ -1,5 +1,5 @@
#!/usr/bin/make
# WARN: gmake syntax
########################################################
# Makefile for Ansible
#
@@ -15,6 +15,7 @@
# variable section
NAME = "ansible"
OS = $(shell uname -s)
# Manpages are currently built with asciidoc -- would like to move to markdown
# This doesn't evaluate until it's called. The -D argument is the
@@ -32,7 +33,12 @@ VERSION := $(shell cat VERSION)
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
DATE := $(shell date --date="$(GIT_DATE)" +%Y%m%d%H%M)
endif
# RPM build parameters
RPMSPECDIR= packaging/rpm