more gitcompile cleanups

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

diff --git a/Makefile b/Makefile
index d6cde7936aa4702827ac9cee8bfa3fc6cc5aec61..13646bb295c72af1fae84976d36b1877fd29ee7b 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -5,7 +5,7 @@ SUBDIRS = ac3dec as10k1 envy24control hdsploader hdspconf hdspmixer \
        usx2yloader vxloader echomixer ld10k1 qlo10k1
 
 all:
-       @for i in $(SUBDIRS); do cd $(TOP)/$$i; ./gitcompile $(GITCOMPILE_ARGS); cd ..; make -C $$i; done
+       @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
@@ -13,7 +13,7 @@ install:
 alsa-dist:
        @echo $(VERSION) >> $(TOP)/version
        @mkdir -p $(TOP)/distdir
-       @for i in $(SUBDIRS); do cd $(TOP)/$$i; ./gitcompile $(GITCOMPILE_ARGS); cd ..; make -C $$i alsa-dist; done
+       @for i in $(SUBDIRS); do cd $(TOP)/$$i; echo $(TOP)/$$i; ./gitcompile $(GITCOMPILE_ARGS) || exit 1; cd ..; make -C $$i alsa-dist || exit 1; done
        @mv distdir alsa-tools-$(VERSION)
        @tar --create --verbose --file=- alsa-tools-$(VERSION) | bzip2 -c -9 > alsa-tools-$(VERSION).tar.bz2
        @mv alsa-tools-$(VERSION) distdir

diff --git a/as10k1/gitcompile b/as10k1/gitcompile
index 2089bd45e58ad31ca2c7097479eb973ed6e06ac0..472564604ba5d3b6222e8725f2008ea6b5bfaeca 100755 (executable)
--- a/as10k1/gitcompile
+++ b/as10k1/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
@@ -22,6 +25,6 @@ echo "CFLAGS=$CFLAGS"
 echo "./configure $@"
 ./configure $@ || exit 1
 unset CFLAGS
-if [ -z "$GITCOMPILE_NO_MAKE" ]; then
+if test -z "$GITCOMPILE_NO_MAKE" ; then
   make || exit 1
 fi

diff --git a/envy24control/gitcompile b/envy24control/gitcompile
index 2089bd45e58ad31ca2c7097479eb973ed6e06ac0..14eb27b0882478b993cb3c6ee1389f4c31a00c9e 100755 (executable)
--- a/envy24control/gitcompile
+++ b/envy24control/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
@@ -22,6 +25,6 @@ echo "CFLAGS=$CFLAGS"
 echo "./configure $@"
 ./configure $@ || exit 1
 unset CFLAGS
-if [ -z "$GITCOMPILE_NO_MAKE" ]; then
+if test -z "$GITCOMPILE_NO_MAKE" ; then
   make || exit 1
 fi

diff --git a/hdspconf/gitcompile b/hdspconf/gitcompile
index 2089bd45e58ad31ca2c7097479eb973ed6e06ac0..8eeab923a495d05b7947b35d3cee5933b8797bf9 100755 (executable)
--- a/hdspconf/gitcompile
+++ b/hdspconf/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

diff --git a/hdsploader/gitcompile b/hdsploader/gitcompile
index 58328bd3a50e0d2b21b459289b568eff621897e2..ae2be2671729a4250bec0c60d8fbb0f45107f79b 100755 (executable)
--- a/hdsploader/gitcompile
+++ b/hdsploader/gitcompile
@@ -8,6 +8,6 @@ echo "CFLAGS=$CFLAGS"
 echo "./configure $@"
 ./configure $@ || exit 1
 unset CFLAGS
-if [ -z "$GITCOMPILE_NO_MAKE" ]; then
+if test -z "$GITCOMPILE_NO_MAKE"; then
   make || exit 1
 fi

diff --git a/hdspmixer/gitcompile b/hdspmixer/gitcompile
index 3a788f6c630ecba2523f006adbd06cf09c0b3c19..65196dd4481470f1113f90f9e675565934186dde 100755 (executable)
--- a/hdspmixer/gitcompile
+++ b/hdspmixer/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
@@ -22,6 +25,6 @@ echo "CFLAGS=$CFLAGS"
 echo "./configure $@"
 ./configure $@ || exit 1
 unset CFLAGS
-if [ -z "$GITCOMPILE_NO_MAKE" ]; then
+if test -z "$GITCOMPILE_NO_MAKE"; then
   make || exit 1
 fi

diff --git a/rmedigicontrol/gitcompile b/rmedigicontrol/gitcompile
index 2089bd45e58ad31ca2c7097479eb973ed6e06ac0..c23547e76c003d6668f3de70a325fc82d880dd7f 100755 (executable)
--- a/rmedigicontrol/gitcompile
+++ b/rmedigicontrol/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 -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
@@ -22,6 +25,6 @@ echo "CFLAGS=$CFLAGS"
 echo "./configure $@"
 ./configure $@ || exit 1
 unset CFLAGS
-if [ -z "$GITCOMPILE_NO_MAKE" ]; then
+if test -z "$GITCOMPILE_NO_MAKE"; then
   make || exit 1
 fi

diff --git a/sscape_ctl/gitcompile b/sscape_ctl/gitcompile
index 738d4360649d6bd7d64f19ad34765915e4eae0cd..7495afe34d058d4a40a40676cdafa0eb828de4ca 100755 (executable)
--- a/sscape_ctl/gitcompile
+++ b/sscape_ctl/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
@@ -21,6 +24,6 @@ echo "CFLAGS=$CFLAGS"
 echo "./configure $@"
 ./configure $@ || exit 1
 unset CFLAGS
-if [ -z "$GITCOMPILE_NO_MAKE" ]; then
+if test -z "$GITCOMPILE_NO_MAKE"; then
   make || exit 1
 fi