summaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorJeremy Katz <katzj@redhat.com>2008-07-23 14:07:34 -0400
committerJeremy Katz <katzj@redhat.com>2008-07-23 14:09:16 -0400
commitf980cbd5a84f513d659ad329ab309c4510e2136f (patch)
treebaa8a25fd18c603dbddaf5637e24bed37828f0ec /Makefile
parentecd803f1b892e01ad5880edf9612a4536c997c2c (diff)
downloadanaconda-f980cbd5a84f513d659ad329ab309c4510e2136f.tar.gz
anaconda-f980cbd5a84f513d659ad329ab309c4510e2136f.tar.xz
anaconda-f980cbd5a84f513d659ad329ab309c4510e2136f.zip
Running git-tag -f from a makefile rule is a bad idea
As it easily sets you up to move tags accidentally. So if the tag already exists, then we should just bump the version
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile4
1 files changed, 2 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index c490e745d..3c3774e80 100644
--- a/Makefile
+++ b/Makefile
@@ -102,7 +102,7 @@ install:
for d in $(SUBDIRS); do make DESTDIR=`cd $(DESTDIR); pwd` -C $$d install; [ $$? = 0 ] || exit 1; done
tag:
- @git tag -a -m "Tag as anaconda-$(VERSION)-$(RELEASE)" -f anaconda-$(VERSION)-$(RELEASE)
+ @git tag -a -m "Tag as anaconda-$(VERSION)-$(RELEASE)" anaconda-$(VERSION)-$(RELEASE)
@echo "Tagged as anaconda-$(VERSION)-$(RELEASE)"
ChangeLog:
@@ -112,7 +112,7 @@ archive: tag
@rm -f ChangeLog docs/kickstart-docs.txt docs/command-line.txt
@make ChangeLog
@make -C docs kickstart-docs.txt command-line.txt
- @git-archive --format=tar --prefix=anaconda-$(VERSION)/ HEAD > anaconda-$(VERSION).tar
+ @git-archive --format=tar --prefix=anaconda-$(VERSION)/ anaconda-$(VERSION)-$(RELEASE) > anaconda-$(VERSION).tar
@mkdir -p anaconda-$(VERSION)/docs/
@cp docs/kickstart-docs.txt docs/command-line.txt anaconda-$(VERSION)/docs/
@cp ChangeLog anaconda-$(VERSION)/