From: Karsten Hopp <karsten@redhat.com>
Date: Fri, 28 Jan 2011 16:50:39 +0000 (+0100)
Subject: more dist fixes
X-Git-Tag: hwdata-0.235-1~13
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;ds=sidebyside;h=c2daa38c1f652d4a279495681a4bc9f2886e1771;p=oweals%2Fhwdata.git

more dist fixes
---

diff --git a/Makefile b/Makefile
index 8b0b045..b5f868a 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,7 @@
 NAME=$(shell awk '/Name:/ { print $$2 }' hwdata.spec)
 VERSION=$(shell awk '/Version:/ { print $$2 }' hwdata.spec)
 RELEASE=$(shell awk '/Release:/ { a=$$2; sub("%.*","",a); print a }' hwdata.spec)
+RELVER=$(shell awk '/define relver/ { print $3 }' hwdata.spec)
 SOURCEDIR := $(shell pwd)
 
 prefix=$(DESTDIR)/usr
@@ -56,21 +57,21 @@ check:
 	@[ `grep -vc '	' videodrivers` -eq 0 ] || { echo "FAILURE: videodrivers not TAB separated"; exit 1; } && echo "OK: videodrivers"
 
 create-archive:
-	@rm -rf $(NAME)-$(VERSION) $(NAME)-$(VERSION).tar*  2>/dev/null
+	@rm -rf $(NAME)-$(VERSION) $(NAME)-$(VERSION)-$(RELVER).tar*  2>/dev/null
 	@make changelog
-	@git archive --format=tar --prefix=$(NAME)-$(VERSION)/ HEAD > $(NAME)-$(VERSION)-$(RELEASE).tar
+	@git archive --format=tar --prefix=$(NAME)-$(VERSION)/ HEAD > $(NAME)-$(VERSION)-$(RELVER).tar
 	@mkdir $(NAME)-$(VERSION)
 	@cp ChangeLog $(NAME)-$(VERSION)/
-	@tar --append -f $(NAME)-$(VERSION)-$(RELEASE).tar $(NAME)-$(VERSION)
-	@bzip2 -f $(NAME)-$(VERSION)-$(RELEASE).tar
+	@tar --append -f $(NAME)-$(VERSION)-$(RELVER).tar $(NAME)-$(VERSION)
+	@bzip2 -f $(NAME)-$(VERSION)-$(RELVER).tar
 	@rm -rf $(NAME)-$(VERSION)
 	@echo ""
-	@echo "The final archive is in $(NAME)-$(VERSION)-$(RELEASE).tar.bz2"
+	@echo "The final archive is in $(NAME)-$(VERSION)-$(RELVER).tar.bz2"
 
 archive: check clean commit tag create-archive
 
 upload:
-	@scp ${NAME}-$(VERSION).tar.bz2 fedorahosted.org:$(NAME)
+	@scp ${NAME}-$(VERSION)-$(RELVER).tar.bz2 fedorahosted.org:$(NAME)
 
 dummy: