From: Jaroslav Kysela Date: Tue, 19 Aug 2008 17:22:20 +0000 (+0200) Subject: more gitcompile cleanups X-Git-Tag: v1.0.18~2^2~7 X-Git-Url: https://git.alsa-project.org/?a=commitdiff_plain;h=f0bb8866ce2cdf4b78839d2b8bba2cf165c0ed3d;p=alsa-tools.git more gitcompile cleanups Signed-off-by: Jaroslav Kysela --- diff --git a/Makefile b/Makefile index d6cde79..13646bb 100644 --- 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 2089bd4..4725646 100755 --- 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 2089bd4..14eb27b 100755 --- 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 2089bd4..8eeab92 100755 --- 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 58328bd..ae2be26 100755 --- 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 3a788f6..65196dd 100755 --- 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 2089bd4..c23547e 100755 --- 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 738d436..7495afe 100755 --- 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