Support Automake's `aclocal' scheme. Deposit Autoconf fragments in

[cfd] / txtlib.in

diff --git a/txtlib.in b/txtlib.in
index 6c4fbec..4db6917 100755 (executable)
--- a/txtlib.in
+++ b/txtlib.in
@@ -2,7 +2,7 @@
 
 # -*-sh-*-
 #
-# $Id: txtlib.in,v 1.3 2001/01/20 12:02:12 mdw Exp $
+# $Id: txtlib.in,v 1.4 2003/09/24 22:45:57 mdw Exp $
 #
 # Manipulate simple libraries of text chunks
 #
@@ -30,6 +30,11 @@
 #----- Revision history -----------------------------------------------------
 #
 # $Log: txtlib.in,v $
+# Revision 1.4  2003/09/24 22:45:57  mdw
+# Support Automake's `aclocal' scheme.  Deposit Autoconf fragments in
+# `aclocal's' repository.  Apply heinous bodging to `txtlib' and
+# `mkaclocal'.
+#
 # Revision 1.3  2001/01/20 12:02:12  mdw
 # Honour TMPDIR environment variable.
 #
@@ -40,6 +45,8 @@
 # New import.  The old CVS repository was lost in a disk disaster.
 #
 
+set -e
+
 # --- Handle command line arguments ---
 
 files=""
@@ -70,7 +77,7 @@ EOF
       exit 0
       ;;
     -v | --v | --ve | --ver | --vers | --versi | --versio | --version)
-      version=`echo '$Revision: 1.3 $' |
+      version=`echo '$Revision: 1.4 $' |
        sed -n -e 's;^.*: \([0-9.]*\) *\\$;\1;p'`
       echo "txtlib $version; Common Files Distribution version @VERSION@"
       exit 0
@@ -115,7 +122,7 @@ test "$out" = "-" && out=""
 
 case $mode in
   l)
-    sed -n -e "/^.*\*@-\([-a-zA-Z0-9_]*\)-@\*.*$/ s//\1/p" "$@"
+    sed -n -e "/^.*\*@-\([-a-zA-Z0-9_]*\)-@\*.*$/ s//\1/p" /dev/null "$@"
     ;;
   x)
     t=${TMPDIR-/tmp}/txtlib.$$
@@ -128,9 +135,9 @@ case $mode in
     while read LINE; do
       echo "/\*@-$LINE-@\*/,/\*@-#-@\*/ p"
     done >$sedfile
-    test -z "$out" || exec >$out
+    test -z "$out" || exec >"$out"
     sed -e '/\*@-[-a-zA-Z0-9_]*-@\*/ i\
-    *@-#-@*' "$@" | sed -n -f $sedfile | sed -e '/\*@-#-@\*/ d'
+    *@-#-@*' /dev/null "$@" | sed -n -f $sedfile | sed -e '/\*@-#-@\*/ d'
     rm -rf $t
     ;;
 esac