* header-vars.am (DESTDIR): Commented out definition.

diff --git a/ChangeLog b/ChangeLog
index b23e3a3..4793e35 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2000-04-05  Tom Tromey  <tromey@cygnus.com>
 
+       * header-vars.am (DESTDIR): Commented out definition.
+
        * automake.in (require_file_internal): Pass --copy to libtoolize
        if automake was run with `--copy'.
 

diff --git a/header-vars.am b/header-vars.am
index 06eab55..b886754 100644 (file)
--- a/header-vars.am
+++ b/header-vars.am
@@ -38,7 +38,13 @@ oldincludedir = /usr/include
 
 @SET_MAKE@
 
-DESTDIR =
+## We used to define this.  However, we don't because vendor makes
+## (e.g., Solaris, Irix) won't correctly propagate variables that are
+## defined in Makefile.  This particular variable can't be correctly
+## defined by configure (at least, not the current configure), so we
+## simply avoid defining it to allow the user to use this feature with
+## a vendor make.
+## DESTDIR =
 
 ## Some derived variables that have been found to be useful.
 pkgdatadir = $(datadir)/@PACKAGE@

diff --git a/lib/am/header-vars.am b/lib/am/header-vars.am
index 06eab55..b886754 100644 (file)
--- a/lib/am/header-vars.am
+++ b/lib/am/header-vars.am
@@ -38,7 +38,13 @@ oldincludedir = /usr/include
 
 @SET_MAKE@
 
-DESTDIR =
+## We used to define this.  However, we don't because vendor makes
+## (e.g., Solaris, Irix) won't correctly propagate variables that are
+## defined in Makefile.  This particular variable can't be correctly
+## defined by configure (at least, not the current configure), so we
+## simply avoid defining it to allow the user to use this feature with
+## a vendor make.
+## DESTDIR =
 
 ## Some derived variables that have been found to be useful.
 pkgdatadir = $(datadir)/@PACKAGE@