Patch: FYI: PR 295

[Tom Tromey]

I'm checking this in.
This deprecates --output-dir.

Tom

Index: ChangeLog
from  Tom Tromey  <address@hidden>
        Fix for PR automake/295:
        * automake.texi (Invoking Automake): Deprecate --output-dir.
        * automake.in (usage): Don't document --output-dir.
        (output_directory): Don't initialize.
        (parse_arguments): Deprecate --output-dir.

Index: automake.in
===================================================================
RCS file: /cvs/automake/automake/automake.in,v
retrieving revision 1.1283
diff -u -r1.1283 automake.in
--- automake.in 2002/03/11 17:24:13 1.1283
+++ automake.in 2002/03/18 01:36:48
@@ -346,7 +346,7 @@
 
 # Directory where output files go.  Actually, output files are
 # relative to this directory.
-my $output_directory = '.';
+my $output_directory;
 
 # List of Makefile.am's to process, and their corresponding outputs.
 my @input_files = ();
@@ -1157,6 +1157,16 @@
       )
        or exit 1;
 
+    if (defined $output_directory)
+    {
+       print STDERR "$0: `--output-dir' is deprecated\n";
+    }
+    else
+    {
+       # In the next release we'll remove this entirely.
+       $output_directory = '.';
+    }
+
     foreach my $arg (@ARGV)
     {
       if ($arg =~ /^-./)
@@ -8391,7 +8401,6 @@
       --help             print this help, then exit
       --version          print version number, then exit
   -v, --verbose          verbosely list files processed
-  -o, --output-dir=DIR   put generated Makefile.in's into DIR
       --no-force         only update Makefile.in's that are out of date
 
 Dependency tracking:
Index: automake.texi
===================================================================
RCS file: /cvs/automake/automake/automake.texi,v
retrieving revision 1.268
diff -u -r1.268 automake.texi
--- automake.texi 2002/03/05 17:09:29 1.268
+++ automake.texi 2002/03/18 01:36:53
@@ -995,11 +995,10 @@
 @itemx address@hidden
 @opindex -o
 @opindex --output-dir
address@hidden FIXME: This seems to be a left-over from Automake 1.4, unused 
today.
 Put the generated @file{Makefile.in} in the directory @var{dir}.
 Ordinarily each @file{Makefile.in} is created in the directory of the
-corresponding @file{Makefile.am}.  This option is used when making
-distributions.
+corresponding @file{Makefile.am}.  This option is deprecated and will be
+removed in a future release.
 
 @item -v
 @itemx --verbose
Index: stamp-vti
===================================================================
RCS file: /cvs/automake/automake/stamp-vti,v
retrieving revision 1.169
diff -u -r1.169 stamp-vti
--- stamp-vti 2002/03/06 06:47:46 1.169
+++ stamp-vti 2002/03/18 01:36:53
@@ -1,4 +1,4 @@
address@hidden UPDATED 5 March 2002
address@hidden UPDATED 17 March 2002
 @set UPDATED-MONTH March 2002
 @set EDITION 1.6a
 @set VERSION 1.6a
Index: version.texi
===================================================================
RCS file: /cvs/automake/automake/version.texi,v
retrieving revision 1.242
diff -u -r1.242 version.texi
--- version.texi 2002/03/06 06:47:46 1.242
+++ version.texi 2002/03/18 01:36:53
@@ -1,4 +1,4 @@
address@hidden UPDATED 5 March 2002
address@hidden UPDATED 17 March 2002
 @set UPDATED-MONTH March 2002
 @set EDITION 1.6a
 @set VERSION 1.6a