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.

diff --git a/ChangeLog b/ChangeLog
index 85833aaddbb2c8b0893664368da63910b46b621e..690ec1c3f3e78f2e753984371c4fadb3c7640126 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2002-03-17  Tom Tromey  <tromey@redhat.com>
 
+       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.
+
        * m4/init.m4 (AUTOMAKE, ACLOCAL): Removed extra quotes.
        Fixes PR automake/304.
 

diff --git a/automake.in b/automake.in
index 27b5f1b42f608058c4d6c47fb16623921f1f7268..c705d3d316eab75eb4e1bcd385852470021fab09 100755 (executable)
--- a/automake.in
+++ b/automake.in
@@ -346,7 +346,7 @@ my $config_header_location;
 
 # 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 @@ sub parse_arguments ()
       )
        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 @@ Operation modes:
       --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:

diff --git a/automake.texi b/automake.texi
index bd80a52fb7043648236dabcad97edc021024add9..5a6eb033c0bf213238f49929eaed209ed5cb7559 100644 (file)
--- a/automake.texi
+++ b/automake.texi
@@ -995,11 +995,10 @@ dependents.
 @itemx --output-dir=@var{dir}
 @opindex -o
 @opindex --output-dir
-@c 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

diff --git a/stamp-vti b/stamp-vti
index 6acff78485c16ee040f6cff0047889df44afcb22..fd2b2a315aea2b02212be52a93b2dce1a1b9e550 100644 (file)
--- a/stamp-vti
+++ b/stamp-vti
@@ -1,4 +1,4 @@
-@set UPDATED 5 March 2002
+@set UPDATED 17 March 2002
 @set UPDATED-MONTH March 2002
 @set EDITION 1.6a
 @set VERSION 1.6a

diff --git a/version.texi b/version.texi
index 6acff78485c16ee040f6cff0047889df44afcb22..fd2b2a315aea2b02212be52a93b2dce1a1b9e550 100644 (file)
--- a/version.texi
+++ b/version.texi
@@ -1,4 +1,4 @@
-@set UPDATED 5 March 2002
+@set UPDATED 17 March 2002
 @set UPDATED-MONTH March 2002
 @set EDITION 1.6a
 @set VERSION 1.6a