diff options
| author | David Lehman <dlehman@redhat.com> | 2009-03-04 20:45:57 -0600 |
|---|---|---|
| committer | David Lehman <dlehman@redhat.com> | 2009-03-04 20:45:57 -0600 |
| commit | db77fac58a1ab609a73bd7dd6d71ee51bcf0e1f3 (patch) | |
| tree | 0279b0573115d6d79f5b4c1892fdd55cb5f7f41b /Makefile | |
| parent | 78b1415591a1db738d0c09b9de50e501e2048c28 (diff) | |
| parent | 270003cd1f0c09a77608c4b0a07687c822f56274 (diff) | |
| download | anaconda-db77fac58a1ab609a73bd7dd6d71ee51bcf0e1f3.tar.gz anaconda-db77fac58a1ab609a73bd7dd6d71ee51bcf0e1f3.tar.xz anaconda-db77fac58a1ab609a73bd7dd6d71ee51bcf0e1f3.zip | |
Merge branch 'master' into storage
Conflicts:
anaconda
fsset.py
iutil.py
iw/partition_gui.py
partedUtils.py
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 7 |
1 files changed, 6 insertions, 1 deletions
@@ -108,11 +108,13 @@ tag: ChangeLog: (GIT_DIR=.git git log > .changelog.tmp && mv .changelog.tmp ChangeLog; rm -f .changelog.tmp) || (touch ChangeLog; echo 'git directory not found: installing possibly empty changelog.' >&2) +ARCHIVE_TAG := anaconda-$(VERSION)-$(RELEASE) + archive-no-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)/ anaconda-$(VERSION)-$(RELEASE) > anaconda-$(VERSION).tar + @git archive --format=tar --prefix=anaconda-$(VERSION)/ $(ARCHIVE_TAG) > anaconda-$(VERSION).tar @mkdir -p anaconda-$(VERSION)/docs/ @cp docs/kickstart-docs.txt docs/command-line.txt anaconda-$(VERSION)/docs/ @cp ChangeLog anaconda-$(VERSION)/ @@ -120,6 +122,9 @@ archive-no-tag: @bzip2 -f anaconda-$(VERSION).tar @rm -rf anaconda-$(VERSION) +scratch: + $(MAKE) ARCHIVE_TAG=master archive-no-tag + archive: @make tag @make archive-no-tag |