improve Makefile error paths, improve automake directory detection for sbiload

Signed-off-by: Jaroslav Kysela <perex@perex.cz>

diff --git a/Makefile b/Makefile
index 13646bb295c72af1fae84976d36b1877fd29ee7b..9cd307923a7ea70013aa22bafc3ee1880ca2dd4a 100644 (file)
--- 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 de033bf1974952921bfb50d9c5fb2a1c6243c8cf..f499e77a930e486a442e36281253e11cc403862d 100644 (file)
--- 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 2089bd45e58ad31ca2c7097479eb973ed6e06ac0..8eeab923a495d05b7947b35d3cee5933b8797bf9 100755 (executable)
--- 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