Mesa (robust-tarballs): make: Use better var names on packaging.

[Jose Fonseca]

Module: Mesa
Branch: robust-tarballs
Commit: 1856230d9fa61710cce3e152b8d88b1269611a73
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=1856230d9fa61710cce3e152b8d88b1269611a73

Author: José Fonseca <jose.r.fonseca at gmail.com>
Date:   Tue Jul 12 23:41:27 2011 +0100

make: Use better var names on packaging.

---

 Makefile |   44 ++++++++++++++++++++++----------------------
 1 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/Makefile b/Makefile
index 10374f0..6bd4cfd 100644
--- a/Makefile
+++ b/Makefile
@@ -183,9 +183,9 @@ ultrix-gcc:
 
 # Rules for making release tarballs
 
-VERSION=7.12-devel
-DIRECTORY = Mesa-$(VERSION)
-LIB_NAME = MesaLib-$(VERSION)
+PACKAGE_VERSION=7.12-devel
+PACKAGE_DIR = Mesa-$(PACKAGE_VERSION)
+PACKAGE_NAME = MesaLib-$(PACKAGE_VERSION)
 
 EXTRA_FILES = \
 	aclocal.m4					\
@@ -217,12 +217,12 @@ parsers: configure
 	$(MAKE) -C src/mesa/program lex.yy.c program_parse.tab.c program_parse.tab.h
 
 # Everything for new a Mesa release:
-ARCHIVES = $(LIB_NAME).tar.gz \
-	$(LIB_NAME).tar.bz2 \
-	$(LIB_NAME).zip \
+ARCHIVES = $(PACKAGE_NAME).tar.gz \
+	$(PACKAGE_NAME).tar.bz2 \
+	$(PACKAGE_NAME).zip \
 
 tarballs: md5
-	rm -f ../$(DIRECTORY) $(LIB_NAME).tar
+	rm -f ../$(PACKAGE_DIR) $(PACKAGE_NAME).tar
 
 # Helper for autoconf builds
 ACLOCAL = aclocal
@@ -244,29 +244,29 @@ manifest.txt: .git
 	( \
 		ls -1 $(EXTRA_FILES) ; \
 		git ls-files $(IGNORE_FILES) \
-	) | sed -e '/^\(.*\/\)\?\./d' -e "s@^@$(DIRECTORY)/@" > $@
+	) | sed -e '/^\(.*\/\)\?\./d' -e "s@^@$(PACKAGE_DIR)/@" > $@
 
-../$(DIRECTORY):
+../$(PACKAGE_DIR):
 	ln -s $(PWD) $@
 
-$(LIB_NAME).tar: parsers ../$(DIRECTORY) manifest.txt
-	cd .. ; tar -cf $(DIRECTORY)/$(LIB_NAME).tar -T $(DIRECTORY)/manifest.txt
+$(PACKAGE_NAME).tar: parsers ../$(PACKAGE_DIR) manifest.txt
+	cd .. ; tar -cf $(PACKAGE_DIR)/$(PACKAGE_NAME).tar -T $(PACKAGE_DIR)/manifest.txt
 
-$(LIB_NAME).tar.gz: $(LIB_NAME).tar ../$(DIRECTORY)
-	gzip --stdout --best $(LIB_NAME).tar > $(LIB_NAME).tar.gz
+$(PACKAGE_NAME).tar.gz: $(PACKAGE_NAME).tar ../$(PACKAGE_DIR)
+	gzip --stdout --best $(PACKAGE_NAME).tar > $(PACKAGE_NAME).tar.gz
 
-$(LIB_NAME).tar.bz2: $(LIB_NAME).tar
-	bzip2 --stdout --best $(LIB_NAME).tar > $(LIB_NAME).tar.bz2
+$(PACKAGE_NAME).tar.bz2: $(PACKAGE_NAME).tar
+	bzip2 --stdout --best $(PACKAGE_NAME).tar > $(PACKAGE_NAME).tar.bz2
 
-$(LIB_NAME).zip: parsers ../$(DIRECTORY) manifest.txt
-	rm -f $(LIB_NAME).zip ; \
+$(PACKAGE_NAME).zip: parsers ../$(PACKAGE_DIR) manifest.txt
+	rm -f $(PACKAGE_NAME).zip ; \
 	cd .. ; \
-	zip -q -@ $(LIB_NAME).zip < $(DIRECTORY)/manifest.txt ; \
-	mv $(LIB_NAME).zip $(DIRECTORY)
+	zip -q -@ $(PACKAGE_NAME).zip < $(PACKAGE_DIR)/manifest.txt ; \
+	mv $(PACKAGE_NAME).zip $(PACKAGE_DIR)
 
 md5: $(ARCHIVES)
-	@-md5sum $(LIB_NAME).tar.gz
-	@-md5sum $(LIB_NAME).tar.bz2
-	@-md5sum $(LIB_NAME).zip
+	@-md5sum $(PACKAGE_NAME).tar.gz
+	@-md5sum $(PACKAGE_NAME).tar.bz2
+	@-md5sum $(PACKAGE_NAME).zip
 
 .PHONY: tarballs rm_depend md5