diff options
| author | Ben Longbons <b.r.longbons@gmail.com> | 2014-04-03 08:41:41 -0700 |
|---|---|---|
| committer | Ben Longbons <b.r.longbons@gmail.com> | 2014-04-04 16:50:30 -0700 |
| commit | d53f69d2249120b366b15a2333110372d67fbb5b (patch) | |
| tree | ec27647907a126e58563828a2ff664c6423a2093 /Makefile.in | |
| parent | 5586980e438bc52bf0e5f6c7b662d36d95b48f17 (diff) | |
| download | tmwa-d53f69d2249120b366b15a2333110372d67fbb5b.tar.gz tmwa-d53f69d2249120b366b15a2333110372d67fbb5b.tar.bz2 tmwa-d53f69d2249120b366b15a2333110372d67fbb5b.tar.xz tmwa-d53f69d2249120b366b15a2333110372d67fbb5b.zip | |
Fix travis
Diffstat (limited to 'Makefile.in')
| -rw-r--r-- | Makefile.in | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/Makefile.in b/Makefile.in index d410120..797d3b8 100644 --- a/Makefile.in +++ b/Makefile.in @@ -155,6 +155,8 @@ endif # even though all the related bugs have already been fixed. $(foreach var,$(filter-out .% MAKE% SUFFIXES,${.VARIABLES}),$(if $(filter default,$(origin ${var})),$(eval ${var} =))) +.SECONDARY: + export PATH:=$(realpath ${SRC_DIR}/tools):${PATH} # bash is needed for 'set -o pipefail' below - I have had real bugs there! @@ -421,17 +423,17 @@ override CPPFLAGS += -I . # this only works from within a git checkout dist/%/version.make: $(MKDIR_FIRST) - git show HEAD:version.make > $@ + git --git-dir=${SRC_DIR}/.git show HEAD:version.make > $@ sed 's/^VERSION_FULL := .*/#&\nVERSION_FULL := ${VERSION_FULL}/' -i $@ sed 's/^VERSION_HASH := .*/#&\nVERSION_HASH := ${VERSION_HASH}/' -i $@ dist/%-src.tar: dist/%/version.make - git archive --prefix=$*/ -o $@ HEAD - ( cd dist && tar uf $*-src.tar --mtime="$$(git log -n1 --pretty=%cd)" --mode=664 --owner=root --group=root $*/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 ) rm dist/$*/version.make rmdir dist/$*/ dist/%-attoconf-only.tar: $(MKDIR_FIRST) - git --git-dir=deps/attoconf/.git archive --prefix=$*/deps/attoconf/ HEAD -o $@ + git --git-dir=${SRC_DIR}/deps/attoconf/.git archive --prefix=$*/deps/attoconf/ HEAD -o $@ dist/%-bundled.tar: dist/%-src.tar dist/%-attoconf-only.tar cp dist/$*-src.tar $@ tar Af $@ dist/$*-attoconf-only.tar |