mirror of
https://github.com/privatevoid-net/nix-super.git
synced 2024-11-30 01:26:15 +02:00
Merge pull request #667 from Ericson2314/mk-dist
Don't depend on .git/ when generating source tarball V2
This commit is contained in:
commit
f6a224bd68
2 changed files with 5 additions and 2 deletions
3
local.mk
3
local.mk
|
@ -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
|
||||||
|
|
|
@ -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 = ''
|
||||||
|
|
Loading…
Reference in a new issue