summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorDaniel Brooks2015-08-02 00:59:28 -0400
committerDaniel Brooks2015-08-02 00:59:28 -0400
commiteb15f06896aeb208d19f6f322905c7782125356e (patch)
tree6f28ac50e476e83b212e2827a10d4b6dee0730c9 /Makefile
parent65b511e2d4f4ec9864167e414e76b967eda32dba (diff)
parentb7a9655a695103b3ca2e4e6edfe305f9b44d9250 (diff)
Merge branch 'joeyconfig' of git://git.kitenet.net/propellor into joeyconfig
Conflicts: src/Propellor/Property/SiteSpecific/IABak.hs
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile14
1 files changed, 9 insertions, 5 deletions
diff --git a/Makefile b/Makefile
index 2cf15b98..8b713878 100644
--- a/Makefile
+++ b/Makefile
@@ -17,11 +17,15 @@ install:
cat dist/propellor-*.tar.gz | (cd dist/gittmp && tar zx --strip-components=1)
# cabal sdist does not preserve symlinks, so copy over file
cd dist/gittmp && for f in $$(find -type f); do rm -f $$f; cp -a ../../$$f $$f; done
- cd dist/gittmp && git init && \
- git add . \
- && git commit -q -m "distributed version of propellor" \
- && git bundle create $(DESTDIR)/usr/src/propellor/propellor.git master HEAD \
- && git show-ref master --hash > $(DESTDIR)/usr/src/propellor/head
+ export GIT_AUTHOR_NAME=build \
+ && export GIT_AUTHOR_EMAIL=build@buildhost \
+ && export GIT_COMMITTER_NAME=build \
+ && export GIT_COMMITTER_EMAIL=build@buildhost \
+ && cd dist/gittmp && git init \
+ && git add . \
+ && git commit -q -m "distributed version of propellor" \
+ && git bundle create $(DESTDIR)/usr/src/propellor/propellor.git master HEAD \
+ && git show-ref master --hash > $(DESTDIR)/usr/src/propellor/head
rm -rf dist/gittmp
clean: