[Lemon-commits] [lemon_svn] klao: r2650 - in hugo/trunk: . doc

[Lemon SVN]

Author: klao
Date: Fri Mar 24 21:27:42 2006
New Revision: 2650

Modified:
   hugo/trunk/bootstrap
   hugo/trunk/doc/Makefile.am

Log:
bootstrap: quiet option


Modified: hugo/trunk/bootstrap
==============================================================================
--- hugo/trunk/bootstrap	(original)
+++ hugo/trunk/bootstrap	Fri Mar 24 21:27:42 2006
@@ -1,5 +1,13 @@
 #!/bin/bash
 
+quiet=0
+function quiet { [[ $quiet == 1 ]]; }
+
+if [[ "$1" == "-q" ]]; then
+  quiet=1
+  shift
+fi
+
 prev=
 for option
 do
@@ -67,11 +75,13 @@
   autoheader=autoheader-$acver
 fi
 
-echo "Try using 'autoreconf -vi' instead of this."
+quiet || echo "Try using 'autoreconf -vi' instead of this."
+
+set -e
+quiet || set -x
 
-set -x
-$aclocal -I m4 \
-&& libtoolize --force --copy \
-&& $autoconf \
-&& $autoheader \
-&& $automake --add-missing --copy --gnu
+$aclocal -I m4
+(quiet && exec > /dev/null; libtoolize --force --copy)
+$autoconf
+$autoheader
+$automake --add-missing --copy --gnu

Modified: hugo/trunk/doc/Makefile.am
==============================================================================
--- hugo/trunk/doc/Makefile.am	(original)
+++ hugo/trunk/doc/Makefile.am	Fri Mar 24 21:27:42 2006
@@ -35,7 +35,7 @@
 install-data-local: html/index.html
 	@$(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"; \
 	  $(INSTALL_DATA) $$p $(DESTDIR)$(htmldir)/$$f; \
@@ -43,7 +43,7 @@
 
 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"; \
 	  rm -f $(DESTDIR)$(htmldir)/$$f; \