- updated from Debian (for 1.7.x and 1.8)

Changed files:
    automake-man.patch -> 1.6

diff --git a/automake-man.patch b/automake-man.patch
index 55f03cdd1ac098dff7ec4ed359d1fde9ddf95c27..ad0bfa123265925924a07675db90a26b8cbcf038 100644 (file)
--- a/automake-man.patch
+++ b/automake-man.patch
@@ -1,6 +1,6 @@
---- automake-1.4.orig/automake.1
-+++ automake-1.4/automake.1
-@@ -0,0 +1,223 @@
+--- automake-1.8.orig/automake.1
++++ automake-1.8/automake.1
+@@ -0,0 +1,247 @@
 +.\" Copyright (C) 1992, 1993, 1994, 1995, 1996 Free Software Foundation, Inc.
 +.\" Copyright (C) 1998 Ben Pfaff.
 +.\"
@@ -18,7 +18,7 @@
 +.\" except that this permission notice may be stated in a translation approved
 +.\" by the Foundation.
 +.\"
-+.TH AUTOMAKE 1 "Automake"
++.TH AUTOMAKE 1 "28 Jan 2002"
 +.SH NAME
 +automake - automatically create Makefile.in's from Makefile.am's
 +.SH SYNOPSIS
@@ -32,8 +32,16 @@
 +] [
 +.BR --build-dir= DIR
 +] [
++.B -c
++|
++.B --copy
++] [
 +.B --cygnus
 +] [
++.B -f
++|
++.B --force-missing
++] [
 +.B --foreign
 +] [
 +.B --gnits
@@ -44,6 +52,8 @@
 +] [
 +.B -i
 +|
++.B --ignore-deps
++] [
 +.B --include-deps
 +] [
 +.B --no-force
@@ -60,6 +70,10 @@
 +.B --verbose
 +] [
 +.B --version
++] [
++.B --Werror
++|
++.B --Wno-error
 +]
 +.SH DESCRIPTION
 +.PP
@@ -97,22 +111,22 @@
 +rebuild an out-of-date
 +.BR Makefile.in .  
 +Note that 
-+.B automake
++.I automake
 +must always be run from the topmost directory of a project, even if
 +being used to regenerate the
 +.B Makefile.in
 +in some subdirectory.  This is necessary
 +because 
-+.B automake
++.I automake
 +must scan 
 +.BR configure.in ,
 +and because 
-+.B automake
++.I automake
 +uses the knowledge that a 
 +.B Makefile.in
 +is in a subdirectory to change its behavior in some cases.
 +.PP
-+.B automake
++.I automake
 +accepts the following options:
 +.TP
 +.BI -a
@@ -128,26 +142,33 @@
 +Automake is distributed with several of these files; this option will
 +cause the missing ones to be automatically added to the package,
 +whenever possible.  In general if Automake tells you a file is
-+missing, try using this option.
++missing, try using this option. By default Automake tries to make a
++symbolic link pointing to its own copy of the missing file; this can
++be changed with \fB--copy\fP.
 +.TP
-+.BI --amdir=\fRDIR
++.BI --libdir=\fRDIR
 +Look for Automake data files in directory DIR instead of in the
 +installation directory.  This is typically used for debugging.
 +.TP
-+.BI --build-dir=\fRDIR
-+Tell Automake where the build directory is.  This option is used
-+when including dependencies into a 
-+.B Makefile.in
-+generated by 
-+.B make
-+.BR dist ; 
-+it should not be used otherwise.
++.BI -c
++.TP
++.BI --copy
++When used with \fB--add-missing\fP, causes installed files to be copied.
++The default is to make a symbolic link.
 +.TP
 +.BI --cygnus
 +Causes the generated 
 +.BR Makefile.in s 
 +to follow Cygnus rules, instead of GNU or Gnits rules.
 +.TP
++.BI -f
++.TP
++.BI --force-missing
++When used with \fB--add-missing\fP, causes standard files to be rebuilt
++even if they already exist in the source tree.
++This involves removing the file from the source tree before creating the
++new symlink (or, with \fB--copy\fP, copying the new file).
++.TP
 +.BI --foreign
 +Set the global strictness to 
 +.BR foreign .
@@ -166,12 +187,13 @@
 +.TP
 +.BI -i
 +.TP
++.BI --ignore-deps
++This disables the dependency tracking feature.
++.TP
 +.BI --include-deps
-+Include all automatically generated dependency information in the
-+generated
-+.BR Makefile.in . 
-+This is generally done
-+when making a distribution.
++This enables the dependency tracking feature. This feature is
++enabled by default. This option is provided for historical
++reasons only and probably should not be used.
 +.TP
 +.BI --no-force
 +Ordinarily 
@@ -198,14 +220,6 @@
 +This option is used when making
 +distributions.
 +.TP
-+.BI --srcdir-name=\fRDIR
-+Tell Automake the name of the source directory associated with the
-+current build.  This option is used when including dependencies into a
-+.B Makefile.in
-+generated by 
-+.BR make dist ; 
-+it should not be used otherwise.
-+.TP
 +.BI -v
 +.TP
 +.BI --verbose
@@ -214,6 +228,16 @@
 +.TP
 +.BI --version
 +Print the version number of Automake and exit.
++.TP
++.BI --Werror
++.TP
++.BI --Wno-error
++.B --Werror
++will cause all warnings issued by
++.I automake
++to become errors. Errors affect the exit status of
++\fIautomake\fP, while warnings do not.
++\fB--Wno-error\fP, the default, causes warning to be treated as warnings only.
 +.PP
 +.SH "SEE ALSO"
 +.BR aclocal (1),
@@ -224,9 +248,10 @@
 +Debian GNU/Linux
 +.B automake
 +package.
---- automake-1.4.orig/aclocal.1
-+++ automake-1.4/aclocal.1
-@@ -0,0 +1,108 @@
+
+--- automake-1.8.orig/aclocal.1
++++ automake-1.8/aclocal.1
+@@ -0,0 +1,106 @@
 +.\" Copyright (C) 1992, 1993, 1994, 1995, 1996 Free Software Foundation, Inc.
 +.\" Copyright (C) 1998 Ben Pfaff.
 +.\"
@@ -318,8 +343,6 @@
 +Cause the output to be put into FILE instead of 
 +.BR aclocal.m4 .
 +.TP
-+.BI -v
-+.TP
 +.BI --verbose
 +Print the names of the files it examines.
 +.TP
@@ -335,14 +358,3 @@
 +Debian GNU/Linux
 +.B automake
 +package.
---- automake-1.4.orig/config.h.in
-+++ automake-1.4/config.h.in
-@@ -0,0 +1,8 @@
-+/* config.h.in.  Generated automatically from configure.in by autoheader.  */
-+
-+/* Name of package */
-+#undef PACKAGE
-+
-+/* Version number of package */
-+#undef VERSION
-+