summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBen Longbons <b.r.longbons@gmail.com>2014-04-09 18:39:31 -0700
committerBen Longbons <b.r.longbons@gmail.com>2014-04-09 19:03:11 -0700
commit66b050356abc494fd57c3b4e42d4abc61c832e8c (patch)
tree444d6f1d30e4d170267d01c421fe3f65dcdc3a86
parent313b592639aa6aaa342ca34b9b6a8a77a299621a (diff)
downloadtmwa-66b050356abc494fd57c3b4e42d4abc61c832e8c.tar.gz
tmwa-66b050356abc494fd57c3b4e42d4abc61c832e8c.tar.bz2
tmwa-66b050356abc494fd57c3b4e42d4abc61c832e8c.tar.xz
tmwa-66b050356abc494fd57c3b4e42d4abc61c832e8c.zip
Fix archive patch mtimev14.4.9
-rw-r--r--.travis.yml5
-rw-r--r--Makefile.in3
2 files changed, 3 insertions, 5 deletions
diff --git a/.travis.yml b/.travis.yml
index 913db19..dd58b51 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -95,11 +95,8 @@ matrix:
- compiler: gcc
env: REAL_CC=gcc-4.8 REAL_CXX=g++-4.8 PPA=ppa:ubuntu-toolchain-r/test PACKAGE=g++-4.8
-# everything that was pushed to master was already on 'test', except
+# everything that was pushed to stable was already on 'master', except
# the version change and some doc changes.
-# As of the next release, current 'master' will become 'stable' and current
-# 'test' will become 'master' (now that 'test' doesn't crash all the time)
branches:
except:
- - master
- stable
diff --git a/Makefile.in b/Makefile.in
index 962eaaf..bfaf436 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -417,6 +417,7 @@ conf-raw/str-%.h: FORCE
$(MKDIR_FIRST)
echo '#define $* "$(value $*)"' | maybe-replace $@
FORCE: ;
+.PHONY: FORCE
override CPPFLAGS += -I .
# distribution tarballs
@@ -428,7 +429,7 @@ dist/%/version.make:
sed 's/^VERSION_HASH := .*/#&\nVERSION_HASH := ${VERSION_HASH}/' -i $@
dist/%-src.tar: dist/%/version.make
git --git-dir=${SRC_DIR}/.git archive --prefix=$*/ -o $@ HEAD
- ( cd dist && tar uf $*-src.tar --mtime="$$(git --git-dir=${SRC_DIR}/.git log -n1 --pretty=%cd)" --mode=664 --owner=root --group=root $*/version.make )
+ ( mtime="$$(git --git-dir=${SRC_DIR}/.git log -n1 --pretty=%ci)" && cd dist && tar uf $*-src.tar --mtime="$${mtime}" --mode=664 --owner=root --group=root $*/version.make )
rm dist/$*/version.make
rmdir dist/$*/
dist/%-attoconf-only.tar: