From b0842f9a139203fb5a2e36863ac9553f3b9c1e5d Mon Sep 17 00:00:00 2001
From: Mike Frysinger <vapier@gentoo.org>
Date: Sat, 9 Oct 2004 20:18:02 +0000
Subject: Thomas Lundquist: have the makefiles depend on the correct file

---
 package/libmad/libmad.mk | 18 +++++++-----------
 1 file changed, 7 insertions(+), 11 deletions(-)

(limited to 'package/libmad/libmad.mk')

diff --git a/package/libmad/libmad.mk b/package/libmad/libmad.mk
index 36e3e9cca..aaedb41d2 100644
--- a/package/libmad/libmad.mk
+++ b/package/libmad/libmad.mk
@@ -4,21 +4,18 @@
 #
 #############################################################
 
-LIBMAD_VERSION=0.15.0b
-
-# Don't alter below this line unless you (think) you know
-# what you are doing! Danger, Danger!
-
+LIBMAD_VERSION=0.15.1b
 LIBMAD_SOURCE=libmad-$(LIBMAD_VERSION).tar.gz
 LIBMAD_SITE=http://easynews.dl.sourceforge.net/sourceforge/mad/
 LIBMAD_DIR=$(BUILD_DIR)/${shell basename $(LIBMAD_SOURCE) .tar.gz}
 LIBMAD_WORKDIR=$(BUILD_DIR)/libmad-$(LIBMAD_VERSION)
+LIBMAD_CAT:=zcat
 
 $(DL_DIR)/$(LIBMAD_SOURCE):
 	$(WGET) -P $(DL_DIR) $(LIBMAD_SITE)/$(LIBMAD_SOURCE)
 
-$(LIBMAD_DIR)/.unpacked:	$(DL_DIR)/$(LIBMAD_SOURCE)
-	gzip -d -c $(DL_DIR)/$(LIBMAD_SOURCE) | tar -C $(BUILD_DIR) -x$(TAR_VERBOSITY)f -
+$(LIBMAD_DIR)/.unpacked: $(DL_DIR)/$(LIBMAD_SOURCE)
+	$(LIBMAD_CAT) $(DL_DIR)/$(LIBMAD_SOURCE) | tar -C $(BUILD_DIR) -x$(TAR_VERBOSITY)f -
 	touch $(LIBMAD_DIR)/.unpacked
 
 $(LIBMAD_DIR)/.configured: $(LIBMAD_DIR)/.unpacked
@@ -32,13 +29,13 @@ $(LIBMAD_DIR)/.configured: $(LIBMAD_DIR)/.unpacked
 		--sysconfdir=/etc \
 		$(DISABLE_NLS) \
 	);
-	touch  $(LIBMAD_DIR)/.configured
+	touch $(LIBMAD_DIR)/.configured
 
-$(LIBMAD_WORKDIR)/libmad:	$(LIBMAD_DIR)/.configured
+$(LIBMAD_WORKDIR)/libmad.la: $(LIBMAD_DIR)/.configured
 	rm -f $@
 	$(MAKE) CC=$(TARGET_CC) -C $(LIBMAD_WORKDIR)
 
-$(LIBMAD_WORKDIR)/.installed: 	$(LIBMAD_WORKDIR)/libmad
+$(LIBMAD_WORKDIR)/.installed: $(LIBMAD_WORKDIR)/libmad.la
 	$(MAKE) prefix=$(TARGET_DIR)/usr -C $(LIBMAD_WORKDIR) install
 	touch $(LIBMAD_WORKDIR)/.installed
 
@@ -53,4 +50,3 @@ libmad-clean:
 
 libmad-dirclean:
 	rm -rf $(LIBMAD_DIR) $(LIBMAD_WORKDIR)
-
-- 
cgit v1.2.3