Changeset 2015:5e51c9eb5e83 in lemon-0.x

Timestamp:

03/24/06 21:27:42 (18 years ago)

Author:

Mihaly Barasz

Branch:

default

Phase:

public

Convert:

svn:c9d7d8f5-90d6-0310-b91f-818b3a526b0e/lemon/trunk@2650

Message:

bootstrap: quiet option

Files:

• bootstrap (modified) (2 diffs)
• doc/Makefile.am (modified) (2 diffs)

bootstrap

@@ -1 +1 @@
 #!/bin/bash
+
+quiet=0
+function quiet { [[ $quiet == 1 ]]; }
+
+if [[ "$1" == "-q" ]]; then
+  quiet=1
+  shift
+fi
 
 prev=
@@ -68 +76 @@
 fi
 
-echo "Try using 'autoreconf -vi' instead of this."
+quiet || echo "Try using 'autoreconf -vi' instead of this."
 
-set -x
-$aclocal -I m4 \
-&& libtoolize --force --copy \
-&& $autoconf \
-&& $autoheader \
-&& $automake --add-missing --copy --gnu
+set -e
+quiet || set -x
+
+$aclocal -I m4
+(quiet && exec > /dev/null; libtoolize --force --copy)
+$autoconf
+$autoheader
+$automake --add-missing --copy --gnu

doc/Makefile.am

@@ -36 +36 @@
         @$(NORMAL_INSTALL)
         $(mkinstalldirs) $(DESTDIR)$(htmldir)
-        @dir='$(<D)'; shopt -s nullglob; for p in $$dir/*.html $$dir/*.css $$dir/*.png $$dir/*.dot $$dir/*.php $$dir/*.idx $$dir/*.tag ; do \
+        @dir='html'; shopt -s nullglob; for p in $$dir/*.html $$dir/*.css $$dir/*.png $$dir/*.dot $$dir/*.php $$dir/*.idx $$dir/*.tag ; do \
           f="`echo $$p | sed -e 's|^.*/||'`"; \
           echo " $(INSTALL_DATA) $$p $(DESTDIR)$(htmldir)/$$f"; \
@@ -44 +44 @@
 uninstall-local: html/index.html
         @$(NORMAL_UNINSTALL)
-        @dir='$(<D)'; shopt -s nullglob; for p in $$dir/*.html $$dir/*.css $$dir/*.png $$dir/*.dot $$dir/*.php $$dir/*.idx $$dir/*.tag ; do \
+        @dir='html'; shopt -s nullglob; for p in $$dir/*.html $$dir/*.css $$dir/*.png $$dir/*.dot $$dir/*.php $$dir/*.idx $$dir/*.tag ; do \
           f="`echo $$p | sed -e 's|^.*/||'`"; \
           echo " rm -f $(DESTDIR)$(htmldir)/$$f"; \