put version into release tarball

diff --git a/Makefile b/Makefile
index c294c3a2e06f8bcd313996b0a63cf349ca71bc2d..d0a773c63335726946fe5da1b3d5a10d8be4690f 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -31,7 +31,7 @@ refentry2man := /usr/bin/refentry2man
 $(NAME).8: $(NAME).8.xml $(refentry2man)
        $(refentry2man) < $< > $@.tmp && mv $@.tmp $@ || { rm -f $@.tmp; exit 1; }
 
-dist: clean $(NAME)-$(VERSION).tar.gz
+dist: $(NAME)-$(VERSION).tar.gz
        @echo
        @echo "Do not forget to tag the release"
        @echo
@@ -47,13 +47,11 @@ clean:
 ChangeLog:
        ./changelog.sh
 
-$(NAME)-$(VERSION).tar.gz: $(NAME)-$(VERSION).tar
-       gzip -9 $<
-
-$(NAME)-$(VERSION).tar: $(NAME).8 ChangeLog
+$(NAME)-$(VERSION).tar.gz: $(NAME).8 ChangeLog
        rm -rf $(NAME)-$(VERSION)
        install -d $(NAME)-$(VERSION)
-       git archive HEAD --prefix $(NAME)-$(VERSION)/ -o $@
+       git archive HEAD | tar -x -C $(NAME)-$(VERSION)/
+       sed -i -e "s/VERSION='devel'/VERSION='$(VERSION)'/" $(NAME)-$(VERSION)/$(NAME)
        cp -p $? $(NAME)-$(VERSION)
-       tar -rvf $@ --owner=root --group=root $(NAME)-$(VERSION)/*
+       tar -czf $@ --owner=root --group=root $(NAME)-$(VERSION)
        rm -rf $(NAME)-$(VERSION)