From e1621a4a2a6b1750402d0228cf85920814babc9a Mon Sep 17 00:00:00 2001
From: Ulf Samuelsson <ulf.samuelsson@atmel.com>
Date: Wed, 11 Jul 2007 14:06:06 +0000
Subject: Use <package>_VERSION in all <package>.mk instead of <package>_VER

---
 package/bzip2/bzip2.mk | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

(limited to 'package/bzip2')

diff --git a/package/bzip2/bzip2.mk b/package/bzip2/bzip2.mk
index de0fcc973..8be30bd46 100644
--- a/package/bzip2/bzip2.mk
+++ b/package/bzip2/bzip2.mk
@@ -3,10 +3,10 @@
 # bzip2
 #
 #############################################################
-BZIP2_VER:=1.0.4
-BZIP2_SOURCE:=bzip2-$(BZIP2_VER).tar.gz
-BZIP2_SITE:=http://www.bzip.org/$(BZIP2_VER)
-BZIP2_DIR:=$(BUILD_DIR)/bzip2-$(BZIP2_VER)
+BZIP2_VERSION:=1.0.4
+BZIP2_SOURCE:=bzip2-$(BZIP2_VERSION).tar.gz
+BZIP2_SITE:=http://www.bzip.org/$(BZIP2_VERSION)
+BZIP2_DIR:=$(BUILD_DIR)/bzip2-$(BZIP2_VERSION)
 BZIP2_CAT:=$(ZCAT)
 BZIP2_BINARY:=$(BZIP2_DIR)/bzip2
 BZIP2_TARGET_BINARY:=$(TARGET_DIR)/usr/bin/bzmore
@@ -19,7 +19,7 @@ bzip2-source: $(DL_DIR)/$(BZIP2_SOURCE)
 $(BZIP2_DIR)/.unpacked: $(DL_DIR)/$(BZIP2_SOURCE)
 	$(BZIP2_CAT) $(DL_DIR)/$(BZIP2_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
 	$(SED) "s,ln \$$(,ln -snf \$$(,g" $(BZIP2_DIR)/Makefile
-	$(SED) "s,ln -s (lib.*),ln -snf \$$1 ; ln -snf libbz2.so.$(BZIP2_VER) \
+	$(SED) "s,ln -s (lib.*),ln -snf \$$1 ; ln -snf libbz2.so.$(BZIP2_VERSION) \
             libbz2.so,g" $(BZIP2_DIR)/Makefile-libbz2_so
 ifneq ($(BR2_LARGEFILE),y)
 	$(SED) "s,^BIGFILES,#BIGFILES,g" $(BZIP2_DIR)/Makefile
@@ -29,19 +29,19 @@ endif
 	$(SED) "s:-O2:$(TARGET_CFLAGS):" $(BZIP2_DIR)/Makefile-libbz2_so
 	touch $@
 
-$(STAGING_DIR)/lib/libbz2.so.$(BZIP2_VER): $(BZIP2_DIR)/.unpacked
+$(STAGING_DIR)/lib/libbz2.so.$(BZIP2_VERSION): $(BZIP2_DIR)/.unpacked
 	$(TARGET_CONFIGURE_OPTS) \
 	$(MAKE) CC=$(TARGET_CC) RANLIB=$(TARGET_RANLIB) -C $(BZIP2_DIR) -f Makefile-libbz2_so
 	$(TARGET_CONFIGURE_OPTS) \
 	$(MAKE) CC=$(TARGET_CC) RANLIB=$(TARGET_RANLIB) -C $(BZIP2_DIR) libbz2.a
 	cp $(BZIP2_DIR)/bzlib.h $(STAGING_DIR)/usr/include/
-	cp $(BZIP2_DIR)/libbz2.so.$(BZIP2_VER) $(STAGING_DIR)/lib/
+	cp $(BZIP2_DIR)/libbz2.so.$(BZIP2_VERSION) $(STAGING_DIR)/lib/
 	cp $(BZIP2_DIR)/libbz2.a $(STAGING_DIR)/usr/lib/
-	(cd $(STAGING_DIR)/usr/lib/ ; ln -snf ../../lib/libbz2.so.$(BZIP2_VER) libbz2.so)
-	(cd $(STAGING_DIR)/lib ; ln -snf libbz2.so.$(BZIP2_VER) libbz2.so.1.0; \
-	 ln -snf libbz2.so.$(BZIP2_VER) libbz2.so.1)
+	(cd $(STAGING_DIR)/usr/lib/ ; ln -snf ../../lib/libbz2.so.$(BZIP2_VERSION) libbz2.so)
+	(cd $(STAGING_DIR)/lib ; ln -snf libbz2.so.$(BZIP2_VERSION) libbz2.so.1.0; \
+	 ln -snf libbz2.so.$(BZIP2_VERSION) libbz2.so.1)
 
-$(BZIP2_BINARY): $(STAGING_DIR)/lib/libbz2.so.$(BZIP2_VER)
+$(BZIP2_BINARY): $(STAGING_DIR)/lib/libbz2.so.$(BZIP2_VERSION)
 	$(TARGET_CONFIGURE_OPTS) \
 	$(MAKE) CC=$(TARGET_CC) -C $(BZIP2_DIR) bzip2 bzip2recover
 	touch -c $@
@@ -53,10 +53,10 @@ $(BZIP2_TARGET_BINARY): $(BZIP2_BINARY)
 	$(MAKE) PREFIX=$(TARGET_DIR)/usr -C $(BZIP2_DIR) install
 	rm -f $(TARGET_DIR)/usr/lib/libbz2.a
 	rm -f $(TARGET_DIR)/usr/include/bzlib.h
-	cp $(BZIP2_DIR)/libbz2.so.$(BZIP2_VER) $(TARGET_DIR)/usr/lib/
+	cp $(BZIP2_DIR)/libbz2.so.$(BZIP2_VERSION) $(TARGET_DIR)/usr/lib/
 	(cd $(TARGET_DIR)/usr/lib; \
-	ln -snf libbz2.so.$(BZIP2_VER) libbz2.so.1.0; \
-	ln -snf libbz2.so.$(BZIP2_VER) libbz2.so)
+	ln -snf libbz2.so.$(BZIP2_VERSION) libbz2.so.1.0; \
+	ln -snf libbz2.so.$(BZIP2_VERSION) libbz2.so)
 	(cd $(TARGET_DIR)/usr/bin; \
 	ln -snf bzip2 bunzip2; \
 	ln -snf bzip2 bzcat; \
-- 
cgit v1.2.3