diff options
author | Alexandre Duret-Lutz <adl@gnu.org> | 2005-06-30 11:07:41 +0000 |
---|---|---|
committer | Alexandre Duret-Lutz <adl@gnu.org> | 2005-06-30 11:07:41 +0000 |
commit | c01e9982c1591b40f0072794842012fd7be2808f (patch) | |
tree | ff849f8fb687daafaf8a9813fbfdd3f4e03966d7 /lib/am/header-vars.am | |
parent | 2d3e84e539ad9333eb48a5197b37be1d9b6029b7 (diff) | |
download | automake-c01e9982c1591b40f0072794842012fd7be2808f.tar.gz |
* automake.in (scan_autoconf_traces): Scan AC_SUBST_TRACE instead
of AC_SUBST.
* lib/am/header-vars.am (srcdir, top_srcdir, top_builddir, INSTALL):
Do not define, they are AC_SUBST_TRACEd by Autoconf.
* m4/init.m4 (AM_INIT_AUTOMAKE): Require Autoconf 2.59c.
* tests/include.test: Call AC_OUTPUT.
Diffstat (limited to 'lib/am/header-vars.am')
-rw-r--r-- | lib/am/header-vars.am | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/lib/am/header-vars.am b/lib/am/header-vars.am index dd3a60dbb..ee7b3cacb 100644 --- a/lib/am/header-vars.am +++ b/lib/am/header-vars.am @@ -1,5 +1,5 @@ ## automake - create Makefile.in from Makefile.am -## Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2003 +## Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2003, 2005 ## Free Software Foundation, Inc. ## This program is free software; you can redistribute it and/or modify @@ -17,8 +17,6 @@ ## Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA ## 02110-1301, USA. -srcdir = @srcdir@ -top_srcdir = @top_srcdir@ VPATH = @srcdir@ @SET_MAKE@ @@ -36,11 +34,7 @@ pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ -## Location of top build directory relative to this one. -top_builddir = %TOPDIR% - am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -INSTALL = @INSTALL@ install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c |