From 6d425b7bce2ab8ad3e99ff3955e3892f26e7c263 Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Fri, 30 Oct 1998 14:14:59 +0000 Subject: [PATCH] 1998-10-29 Gary V. Vaughan * automake.in (parse_arguments): Fixed type of -c for copying 1998-10-30 Tom Tromey * automake.texi (Install): Documented DESTDIR more fully. From Jeff Garzik. --- ChangeLog | 7 +++++++ automake.in | 2 +- automake.texi | 20 ++++++++++++++++++-- stamp-vti | 2 +- version.texi | 2 +- 5 files changed, 28 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 4050cc14..ba8e89fe 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,12 @@ +1998-10-29 Gary V. Vaughan + + * automake.in (parse_arguments): Fixed type of -c for copying + 1998-10-30 Tom Tromey + * automake.texi (Install): Documented DESTDIR more fully. From + Jeff Garzik. + * automake.in (MACRO_PATTERN): Recognize `+='. (BOGUS_MACRO_PATTERN): Likewise. (read_am_file): Handle `+=' assignments. diff --git a/automake.in b/automake.in index 250357c9..21fc180a 100755 --- a/automake.in +++ b/automake.in @@ -475,7 +475,7 @@ sub parse_arguments { $add_missing = 1; } - elsif ($arglist[0] eq '--copy' || $arglist[0] eq 'c') + elsif ($arglist[0] eq '--copy' || $arglist[0] eq '-c') { $copy_missing = 1; } diff --git a/automake.texi b/automake.texi index 72716897..35e810f6 100644 --- a/automake.texi +++ b/automake.texi @@ -2812,10 +2812,26 @@ the name (e.g. @samp{myexecbin_PROGRAMS} is installed by @samp{install-exec}. All other user-defined prefixes are installed by @samp{install-data}. +@vindex DESTDIR Automake generates support for the @samp{DESTDIR} variable in all -install rules; see @ref{Makefile Conventions, , , standards, The GNU +install rules. @samp{DESTDIR} is used during the @samp{make install} +step to relocate install objects into a staging area. Each object and +path is prefixed with the value of @samp{DESTDIR} before being copied +into the install area. Here is an example of typical DESTDIR usage: + +@example +make DESTDIR=/tmp/staging install +@end example + +This places install objects in a directory tree built under +@file{/tmp/staging}. If @file{/gnu/bin/foo} and +@file{/gnu/share/aclocal/foo.m4} are to be installed, the above command +would install @file{/tmp/staging/gnu/bin/foo} and +@file{/tmp/staging/gnu/share/aclocal/foo.m4}. + +This feature is commonly used to build install images and packages. For +more information, see @ref{Makefile Conventions, , , standards, The GNU Coding Standards}. -@vindex DESTDIR @node Clean, Dist, Install, Top diff --git a/stamp-vti b/stamp-vti index 447c6a2a..761f848e 100644 --- a/stamp-vti +++ b/stamp-vti @@ -1,3 +1,3 @@ -@set UPDATED 16 October 1998 +@set UPDATED 30 October 1998 @set EDITION 1.3c @set VERSION 1.3c diff --git a/version.texi b/version.texi index 447c6a2a..761f848e 100644 --- a/version.texi +++ b/version.texi @@ -1,3 +1,3 @@ -@set UPDATED 16 October 1998 +@set UPDATED 30 October 1998 @set EDITION 1.3c @set VERSION 1.3c -- 2.43.5