lix-project/lix
20
55
Fork 31
Code Issues 345 Code Review (Gerrit) Projects 3 Releases Wiki Activity

Merge pull request #667 from Ericson2314/mk-dist

Browse source 
Don't depend on .git/ when generating source tarball V2
This commit is contained in:
Eelco Dolstra 2015-10-26 11:14:12 +01:00
parent 45b2f32cc1 a7dd26961d
commit f6a224bd68
2 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
local.mk
View file

@ -1,5 +1,6 @@
ifeq ($(MAKECMDGOALS), dist) ifeq ($(MAKECMDGOALS), dist)
dist-files += $(shell git ls-files) # Make sure we are in repo root with `--git-dir`
dist-files += $(shell git --git-dir=.git ls-files || find * -type f)
endif endif
dist-files += configure config.h.in nix.spec dist-files += configure config.h.in nix.spec

4
release.nix
View file

@ -36,7 +36,9 @@ let
postUnpack = '' postUnpack = ''
# Clean up when building from a working tree. # Clean up when building from a working tree.
(cd $sourceRoot && (git ls-files -o | xargs -r rm -v)) if [[ -d $sourceRoot/.git ]]; then
git -C $sourceRoot clean -fd
fi
''; '';
preConfigure = '' preConfigure = ''