From: Michael Tremer <michael.tremer@ipfire.org>
Date: Mon, 22 Feb 2021 11:01:23 +0000 (+0000)
Subject: alsa: Update automake
X-Git-Tag: v2.25-core155~34^2~40
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=71156719191619a16ca14b7c8848f0206a2479ee;p=ipfire-2.x.git

alsa: Update automake

All sources are being extracted into $(DIR_APP) now because the
UPDATE_AUTOMAKE macro does not search outside of that directory.

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
---

diff --git a/lfs/alsa b/lfs/alsa
index aee7915c19..23ad58cf69 100644
--- a/lfs/alsa
+++ b/lfs/alsa
@@ -88,17 +88,18 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
 	@rm -rf $(DIR_SRC)/alsa*
 	cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
+	cd $(DIR_APP) && tar xfj $(DIR_DL)/alsa-utils-$(UVER).tar.bz2
+	cd $(DIR_APP) && tar xfj $(DIR_DL)/alsa-firmware-$(FVER).tar.bz2
+	$(UPDATE_AUTOMAKE)
 	cd $(DIR_APP) && ./configure
 	cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE)
 	cd $(DIR_APP) && make install
-	cd $(DIR_SRC) && tar xfj $(DIR_DL)/alsa-utils-$(UVER).tar.bz2
-	cd $(DIR_SRC)/alsa-utils-$(UVER) && ./configure --disable-xmlto
-	cd $(DIR_SRC)/alsa-utils-$(UVER) && make $(MAKETUNING) $(EXTRA_MAKE)
-	cd $(DIR_SRC)/alsa-utils-$(UVER) && make install
-	cd $(DIR_SRC) && tar xfj $(DIR_DL)/alsa-firmware-$(FVER).tar.bz2
-	cd $(DIR_SRC)/alsa-firmware-$(FVER) && ./configure
-	cd $(DIR_SRC)/alsa-firmware-$(FVER) && make $(MAKETUNING) $(EXTRA_MAKE)
-	cd $(DIR_SRC)/alsa-firmware-$(FVER) && make install
+	cd $(DIR_APP)/alsa-utils-$(UVER) && ./configure --disable-xmlto
+	cd $(DIR_APP)/alsa-utils-$(UVER) && make $(MAKETUNING) $(EXTRA_MAKE)
+	cd $(DIR_APP)/alsa-utils-$(UVER) && make install
+	cd $(DIR_APP)/alsa-firmware-$(FVER) && ./configure
+	cd $(DIR_APP)/alsa-firmware-$(FVER) && make $(MAKETUNING) $(EXTRA_MAKE)
+	cd $(DIR_APP)/alsa-firmware-$(FVER) && make install
 	# install initscript
 	$(call INSTALL_INITSCRIPT,alsa)
 	@rm -rf $(DIR_SRC)/alsa*