improve Makefile error paths, improve automake directory detection for sbiload

Signed-off-by: Jaroslav Kysela <perex@perex.cz>
This commit is contained in:
Jaroslav Kysela 2008-08-19 19:33:36 +02:00
parent 2a8feeba76
commit 07da829731
3 changed files with 10 additions and 7 deletions

View file

@ -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 @for i in $(SUBDIRS); do cd $(TOP)/$$i; echo $(TOP)/$$i; ./gitcompile $(GITCOMPILE_ARGS) || exit 1; cd ..; make -C $$i || exit 1; done
install: 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: alsa-dist:
@echo $(VERSION) >> $(TOP)/version @echo $(VERSION) >> $(TOP)/version
@ -20,4 +20,4 @@ alsa-dist:
clean: clean:
rm -rf *~ distdir 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

View file

@ -1,13 +1,13 @@
SUBDIRS = sbiload SUBDIRS = sbiload
all: 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: 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: 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: clean:
@for i in $(SUBDIRS); do $(MAKE) -C $$i clean; done @for i in $(SUBDIRS); do $(MAKE) -C $$i clean || exit 1; done

View file

@ -1,12 +1,15 @@
#!/bin/bash #!/bin/bash
if test "x$AUTOMAKE_DIR" = "x"; then if test -z "$AUTOMAKE_DIR"; then
if test -d /usr/local/share/automake; then if test -d /usr/local/share/automake; then
AUTOMAKE_DIR=/usr/local/share/automake AUTOMAKE_DIR=/usr/local/share/automake
fi fi
if test -d /usr/share/automake; then if test -d /usr/share/automake; then
AUTOMAKE_DIR="/usr/share/automake" AUTOMAKE_DIR="/usr/share/automake"
fi fi
if test -z "$AUTOMAKE_DIR"; then
AUTOMAKE_DIR=/usr/share/`ls /usr/share | grep automake | tail -n 1`
fi
fi fi
for f in install-sh mkinstalldirs missing; do for f in install-sh mkinstalldirs missing; do