* autoheader.sh: Remove the duplicate trap code.

diff --git a/ChangeLog b/ChangeLog
index 9e2d52e37025d37463558dea012db9d878ff152b..c33ad5b6434baf2b6f478bef6608d01f045188d1 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2000-02-10  Akim Demaille  <akim@epita.fr>
+
+       * autoheader.sh: Remove the duplicate trap code.
+
 2000-02-10  Akim Demaille  <akim@epita.fr>
 
        * acgeneral.m4 (AC_OUTPUT): When dispatching your arguments, use

diff --git a/autoheader.in b/autoheader.in
index 28babfca3f1fa4516acee372de94991a237589a4..d1c87d6470d24ebd2884b81d66d8d2507ba3aff4 100644 (file)
--- a/autoheader.in
+++ b/autoheader.in
@@ -35,7 +35,7 @@ given.
   -h, --help            print this help, then exit
       --version         print version number, then exit
   -d, --debug           don't remove temporary files
-  -m, --macrodir=DIR    directory storing macro files
+  -m, --macrodir=DIR    directory storing Autoconf's macro files
   -l, --localdir=DIR    directory storing \`aclocal.m4' and \`acconfig.h'
   -v, --verbose         verbosely report processing
 
@@ -185,8 +185,6 @@ case "$config_h" in
 *) config_h_in="$config_h.in" ;;
 esac
 
-tmpout=$ah_base.out
-$debug || trap "rm -f $ah_base*; exit 1" 1 2 15
 # Don't write "do not edit" -- it will get copied into the
 # config.h, which it's ok to edit.
 cat <<EOF >$tmpout

diff --git a/autoheader.sh b/autoheader.sh
index 28babfca3f1fa4516acee372de94991a237589a4..d1c87d6470d24ebd2884b81d66d8d2507ba3aff4 100644 (file)
--- a/autoheader.sh
+++ b/autoheader.sh
@@ -35,7 +35,7 @@ given.
   -h, --help            print this help, then exit
       --version         print version number, then exit
   -d, --debug           don't remove temporary files
-  -m, --macrodir=DIR    directory storing macro files
+  -m, --macrodir=DIR    directory storing Autoconf's macro files
   -l, --localdir=DIR    directory storing \`aclocal.m4' and \`acconfig.h'
   -v, --verbose         verbosely report processing
 
@@ -185,8 +185,6 @@ case "$config_h" in
 *) config_h_in="$config_h.in" ;;
 esac
 
-tmpout=$ah_base.out
-$debug || trap "rm -f $ah_base*; exit 1" 1 2 15
 # Don't write "do not edit" -- it will get copied into the
 # config.h, which it's ok to edit.
 cat <<EOF >$tmpout

diff --git a/bin/autoheader.in b/bin/autoheader.in
index 28babfca3f1fa4516acee372de94991a237589a4..d1c87d6470d24ebd2884b81d66d8d2507ba3aff4 100644 (file)
--- a/bin/autoheader.in
+++ b/bin/autoheader.in
@@ -35,7 +35,7 @@ given.
   -h, --help            print this help, then exit
       --version         print version number, then exit
   -d, --debug           don't remove temporary files
-  -m, --macrodir=DIR    directory storing macro files
+  -m, --macrodir=DIR    directory storing Autoconf's macro files
   -l, --localdir=DIR    directory storing \`aclocal.m4' and \`acconfig.h'
   -v, --verbose         verbosely report processing
 
@@ -185,8 +185,6 @@ case "$config_h" in
 *) config_h_in="$config_h.in" ;;
 esac
 
-tmpout=$ah_base.out
-$debug || trap "rm -f $ah_base*; exit 1" 1 2 15
 # Don't write "do not edit" -- it will get copied into the
 # config.h, which it's ok to edit.
 cat <<EOF >$tmpout

diff --git a/man/autoheader.1 b/man/autoheader.1
index 3be0c69f652e7c66a1a7449a326bc03d34db4a7e..49ab7d964dd231fcbee47e9fa3299d7798256356 100644 (file)
--- a/man/autoheader.1
+++ b/man/autoheader.1
@@ -20,7 +20,7 @@ print version number, then exit
 don't remove temporary files
 .TP
 \fB\-m\fR, \fB\-\-macrodir\fR=\fIDIR\fR
-directory storing macro files
+directory storing Autoconf's macro files
 .TP
 \fB\-l\fR, \fB\-\-localdir\fR=\fIDIR\fR
 directory storing `aclocal.m4' and `acconfig.h'