summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSean Whitton2020-09-13 20:47:14 -0700
committerJoey Hess2020-09-14 12:05:48 -0400
commit70a9d5a282ca45f908333f6bd5fd69d639340c2c (patch)
treeb6c4983dd2e78df47ad89ea55376edc0bdaecff0
parent333657b15634dfe7c75e6bba2b76bd94eb150c8a (diff)
deal with ./Setup sdist no longer supporting output to stdout
Signed-off-by: Sean Whitton <spwhitton@spwhitton.name>
-rw-r--r--Makefile6
1 files changed, 5 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index 2d55cc44..0cefe0dc 100644
--- a/Makefile
+++ b/Makefile
@@ -17,7 +17,11 @@ install:
install -s dist/build/propellor/propellor $(DESTDIR)/usr/bin/propellor; \
fi
mkdir -p gittmp
- $(CABAL) sdist -o - | (cd gittmp && tar zx --strip-components=1)
+ if [ "$(CABAL)" = ./Setup ]; then \
+ ./Setup sdist --output-directory=gittmp; \
+ else \
+ $(CABAL) sdist -o - | (cd gittmp && tar zx --strip-components=1); \
+ fi
# cabal sdist does not preserve symlinks, so copy over file
cd gittmp && for f in $$(find -type f); do rm -f $$f; cp -a ../$$f $$f; done
# reset mtime on files in git bundle so bundle is reproducible