diff options
| -rw-r--r-- | .travis.yml | 5 | ||||
| -rw-r--r-- | Makefile.in | 3 |
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: |