1.1 --- a/bootstrap Thu Mar 23 20:43:25 2006 +0000
1.2 +++ b/bootstrap Fri Mar 24 20:27:42 2006 +0000
1.3 @@ -1,5 +1,13 @@
1.4 #!/bin/bash
1.5
1.6 +quiet=0
1.7 +function quiet { [[ $quiet == 1 ]]; }
1.8 +
1.9 +if [[ "$1" == "-q" ]]; then
1.10 + quiet=1
1.11 + shift
1.12 +fi
1.13 +
1.14 prev=
1.15 for option
1.16 do
1.17 @@ -67,11 +75,13 @@
1.18 autoheader=autoheader-$acver
1.19 fi
1.20
1.21 -echo "Try using 'autoreconf -vi' instead of this."
1.22 +quiet || echo "Try using 'autoreconf -vi' instead of this."
1.23
1.24 -set -x
1.25 -$aclocal -I m4 \
1.26 -&& libtoolize --force --copy \
1.27 -&& $autoconf \
1.28 -&& $autoheader \
1.29 -&& $automake --add-missing --copy --gnu
1.30 +set -e
1.31 +quiet || set -x
1.32 +
1.33 +$aclocal -I m4
1.34 +(quiet && exec > /dev/null; libtoolize --force --copy)
1.35 +$autoconf
1.36 +$autoheader
1.37 +$automake --add-missing --copy --gnu
2.1 --- a/doc/Makefile.am Thu Mar 23 20:43:25 2006 +0000
2.2 +++ b/doc/Makefile.am Fri Mar 24 20:27:42 2006 +0000
2.3 @@ -35,7 +35,7 @@
2.4 install-data-local: html/index.html
2.5 @$(NORMAL_INSTALL)
2.6 $(mkinstalldirs) $(DESTDIR)$(htmldir)
2.7 - @dir='$(<D)'; shopt -s nullglob; for p in $$dir/*.html $$dir/*.css $$dir/*.png $$dir/*.dot $$dir/*.php $$dir/*.idx $$dir/*.tag ; do \
2.8 + @dir='html'; shopt -s nullglob; for p in $$dir/*.html $$dir/*.css $$dir/*.png $$dir/*.dot $$dir/*.php $$dir/*.idx $$dir/*.tag ; do \
2.9 f="`echo $$p | sed -e 's|^.*/||'`"; \
2.10 echo " $(INSTALL_DATA) $$p $(DESTDIR)$(htmldir)/$$f"; \
2.11 $(INSTALL_DATA) $$p $(DESTDIR)$(htmldir)/$$f; \
2.12 @@ -43,7 +43,7 @@
2.13
2.14 uninstall-local: html/index.html
2.15 @$(NORMAL_UNINSTALL)
2.16 - @dir='$(<D)'; shopt -s nullglob; for p in $$dir/*.html $$dir/*.css $$dir/*.png $$dir/*.dot $$dir/*.php $$dir/*.idx $$dir/*.tag ; do \
2.17 + @dir='html'; shopt -s nullglob; for p in $$dir/*.html $$dir/*.css $$dir/*.png $$dir/*.dot $$dir/*.php $$dir/*.idx $$dir/*.tag ; do \
2.18 f="`echo $$p | sed -e 's|^.*/||'`"; \
2.19 echo " rm -f $(DESTDIR)$(htmldir)/$$f"; \
2.20 rm -f $(DESTDIR)$(htmldir)/$$f; \