From 07da82973156406eec1d36eb3166e6aa56ebdb8c Mon Sep 17 00:00:00 2001
From: Jaroslav Kysela <perex@perex.cz>
Date: Tue, 19 Aug 2008 19:33:36 +0200
Subject: [PATCH] improve Makefile error paths, improve automake directory
 detection for sbiload

Signed-off-by: Jaroslav Kysela <perex@perex.cz>
---
 Makefile               | 4 ++--
 seq/Makefile           | 8 ++++----
 seq/sbiload/gitcompile | 5 ++++-
 3 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/Makefile b/Makefile
index 13646bb..9cd3079 100644
--- a/Makefile
+++ b/Makefile
@@ -8,7 +8,7 @@ all:
 	@for i in $(SUBDIRS); do cd $(TOP)/$$i; echo $(TOP)/$$i; ./gitcompile $(GITCOMPILE_ARGS) || exit 1; cd ..; make -C $$i || exit 1; done
 
 install:
-	@for i in $(SUBDIRS); do make -C $$i DESTDIR=$(DESTDIR) install; done
+	@for i in $(SUBDIRS); do make -C $$i DESTDIR=$(DESTDIR) install || exit 1; done
 
 alsa-dist:
 	@echo $(VERSION) >> $(TOP)/version
@@ -20,4 +20,4 @@ alsa-dist:
 
 clean:
 	rm -rf *~ distdir
-	@for i in $(SUBDIRS); do make -C $$i clean; done
+	@for i in $(SUBDIRS); do make -C $$i clean || exit 1; done
diff --git a/seq/Makefile b/seq/Makefile
index de033bf..f499e77 100644
--- a/seq/Makefile
+++ b/seq/Makefile
@@ -1,13 +1,13 @@
 SUBDIRS = sbiload
 
 all:
-	@for i in $(SUBDIRS); do cd $$i; ./gitcompile $(GITCOMPILE_ARGS); cd ..; $(MAKE) -C $$i; done	
+	@for i in $(SUBDIRS); do cd $$i; echo $$1; ./gitcompile $(GITCOMPILE_ARGS) || exit 1; cd ..; $(MAKE) -C $$i; done
 
 install:
-	@for i in $(SUBDIRS); do $(MAKE) -C $$i DESTDIR=$(DESTDIR) install; done	
+	@for i in $(SUBDIRS); do $(MAKE) -C $$i DESTDIR=$(DESTDIR) install || exit 1; done
 
 alsa-dist:
-	@for i in $(SUBDIRS); do $(MAKE) -C $$i alsa-dist; done
+	@for i in $(SUBDIRS); do $(MAKE) -C $$i alsa-dist || exit 1; done
 
 clean:
-	@for i in $(SUBDIRS); do $(MAKE) -C $$i clean; done
+	@for i in $(SUBDIRS); do $(MAKE) -C $$i clean || exit 1; done
diff --git a/seq/sbiload/gitcompile b/seq/sbiload/gitcompile
index 2089bd4..8eeab92 100755
--- a/seq/sbiload/gitcompile
+++ b/seq/sbiload/gitcompile
@@ -1,12 +1,15 @@
 #!/bin/bash
 
-if test "x$AUTOMAKE_DIR" = "x"; then
+if test -z "$AUTOMAKE_DIR"; then
   if test -d /usr/local/share/automake; then
     AUTOMAKE_DIR=/usr/local/share/automake
   fi
   if test -d /usr/share/automake; then
     AUTOMAKE_DIR="/usr/share/automake"
   fi
+  if test -z "$AUTOMAKE_DIR"; then
+    AUTOMAKE_DIR=/usr/share/`ls /usr/share | grep automake | tail -n 1`
+  fi
 fi
 
 for f in install-sh mkinstalldirs missing; do
-- 
2.47.1