From: Paul Eggert Date: Thu, 24 Aug 2006 22:57:30 +0000 (+0000) Subject: Regenerate. X-Git-Tag: AUTOCONF-2.60a~7 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=2db42f661345ba8543fdc09ac10d6ebd16b7ed0a;p=thirdparty%2Fautoconf.git Regenerate. --- diff --git a/Makefile.in b/Makefile.in index c61d9c22b..9b308df35 100644 --- a/Makefile.in +++ b/Makefile.in @@ -37,15 +37,18 @@ POST_UNINSTALL = : subdir = . DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \ $(srcdir)/Makefile.in $(top_srcdir)/configure AUTHORS COPYING \ - ChangeLog INSTALL NEWS README-alpha THANKS TODO + ChangeLog INSTALL NEWS README-alpha THANKS TODO \ + build-aux/config.guess build-aux/config.sub \ + build-aux/elisp-comp build-aux/install-sh build-aux/mdate-sh \ + build-aux/missing build-aux/texinfo.tex ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/config/m4.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/m4/m4.m4 \ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ configure.lineno configure.status.lineno -mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs +mkinstalldirs = $(install_sh) -d CONFIG_CLEAN_FILES = SOURCES = DIST_SOURCES = @@ -153,15 +156,18 @@ target_alias = @target_alias@ # bin/ must be run first, as it builds executables needed for tests. # autom4te uses autotest.m4f to generate `testsuite', so build tests last. -SUBDIRS = bin . lib config man doc tests -ACLOCAL_AMFLAGS = -I config +SUBDIRS = bin . lib man doc tests +ACLOCAL_AMFLAGS = -I m4 EXTRA_DIST = ChangeLog.0 ChangeLog.1 ChangeLog.2 \ BUGS \ - GNUmakefile Makefile.maint Makefile.cfg + GNUmakefile Makefile.maint Makefile.cfg \ + config/announce-gen config/prev-version.txt MAINTAINERCLEANFILES = $(srcdir)/INSTALL pkgdata_DATA = $(srcdir)/INSTALL AM_MAKEINFOFLAGS = --no-headers --no-validate --no-split +WGET = wget +WGETFLAGS = -C off automake_cvsweb = \ http://sources.redhat.com/cgi-bin/cvsweb.cgi/~checkout~/automake @@ -371,7 +377,7 @@ distdir: $(DISTFILES) esac $(am__remove_distdir) mkdir $(distdir) - $(mkdir_p) $(distdir)/config $(distdir)/tests + $(mkdir_p) $(distdir)/build-aux $(distdir)/config $(distdir)/m4 $(distdir)/tests @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ list='$(DISTFILES)'; for file in $$list; do \ @@ -622,17 +628,15 @@ maintainer-check-tests: autom4te-update: rm -f -r Fetchdir > /dev/null 2>&1 - mkdir Fetchdir; mkdir Fetchdir/Autom4te - (cd Fetchdir && \ - $(WGET) $(automake_cvsweb)/lib/Automake/Configure_ac.pm?$(automake_cvsargs) -O Autom4te/Configure_ac.pm; \ - $(WGET) $(automake_cvsweb)/lib/Automake/Channels.pm?$(automake_cvsargs) -O Autom4te/Channels.pm; \ - $(WGET) $(automake_cvsweb)/lib/Automake/FileUtils.pm?$(automake_cvsargs) -O Autom4te/FileUtils.pm; \ - $(WGET) $(automake_cvsweb)/lib/Automake/Struct.pm?$(automake_cvsargs) -O Autom4te/Struct.pm; \ - $(WGET) $(automake_cvsweb)/lib/Automake/XFile.pm?$(automake_cvsargs) -O Autom4te/XFile.pm; \ - :) + mkdir -p Fetchdir/Autom4te + for file in $(autom4te_files); do \ + $(WGET) $(WGET_FLAGS) \ + "$(automake_cvsweb)/lib/$file?$(automake_cvsargs)" \ + -O "Fetchdir/$$file" || exit; \ + done perl -pi -e 's/Automake::/Autom4te::/g' Fetchdir/Autom4te/*.pm for file in $(autom4te_files); do \ - $(move_if_change) Fetchdir/$$file $(srcdir)/lib/$$file; \ + $(move_if_change) Fetchdir/$$file $(srcdir)/lib/$$file || exit; \ done # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff --git a/aclocal.m4 b/aclocal.m4 index 61c533de0..52b04ac7a 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -589,4 +589,4 @@ AC_SUBST([am__tar]) AC_SUBST([am__untar]) ]) # _AM_PROG_TAR -m4_include([config/m4.m4]) +m4_include([m4/m4.m4]) diff --git a/bin/Makefile.in b/bin/Makefile.in index 096f4c079..cf875918a 100644 --- a/bin/Makefile.in +++ b/bin/Makefile.in @@ -38,11 +38,11 @@ DIST_COMMON = $(srcdir)/../lib/freeze.mk $(srcdir)/Makefile.am \ $(srcdir)/Makefile.in subdir = bin ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/config/m4.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/m4/m4.m4 \ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) -mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs +mkinstalldirs = $(install_sh) -d CONFIG_CLEAN_FILES = am__installdirs = "$(DESTDIR)$(bindir)" binSCRIPT_INSTALL = $(INSTALL_SCRIPT) diff --git a/configure b/configure index 732ecc10d..1c8fbe825 100755 --- a/configure +++ b/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.60 for GNU Autoconf 2.60a. +# Generated by GNU Autoconf 2.60a for GNU Autoconf 2.60a. # # Report bugs to . # @@ -1289,7 +1289,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF GNU Autoconf configure 2.60a -generated by GNU Autoconf 2.60 +generated by GNU Autoconf 2.60a Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. @@ -1303,7 +1303,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. It was created by GNU Autoconf $as_me 2.60a, which was -generated by GNU Autoconf 2.60. Invocation command line was +generated by GNU Autoconf 2.60a. Invocation command line was $ $0 $@ @@ -3219,7 +3219,7 @@ exec 6>&1 # values after options handling. ac_log=" This file was extended by GNU Autoconf $as_me 2.60a, which was -generated by GNU Autoconf 2.60. Invocation command line was +generated by GNU Autoconf 2.60a. Invocation command line was CONFIG_FILES = $CONFIG_FILES CONFIG_HEADERS = $CONFIG_HEADERS @@ -3247,7 +3247,7 @@ current configuration. Usage: $0 [OPTIONS] [FILE]... -h, --help print this help, then exit - -V, --version print version number, then exit + -V, --version print version number and configuration settings, then exit -q, --quiet do not print progress messages -d, --debug don't remove temporary files --recheck update $as_me by reconfiguring in the same conditions @@ -3266,7 +3266,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ GNU Autoconf config.status 2.60a -configured by $0, generated by GNU Autoconf 2.60, +configured by $0, generated by GNU Autoconf 2.60a, with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" Copyright (C) 2006 Free Software Foundation, Inc. diff --git a/doc/Makefile.in b/doc/Makefile.in index 22b1d683c..c4e739d7b 100644 --- a/doc/Makefile.in +++ b/doc/Makefile.in @@ -38,17 +38,17 @@ DIST_COMMON = $(autoconf_TEXINFOS) $(srcdir)/Makefile.am \ $(srcdir)/Makefile.in $(srcdir)/stamp-vti \ $(srcdir)/version.texi $(standards_TEXINFOS) ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/config/m4.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/m4/m4.m4 \ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) -mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs +mkinstalldirs = $(install_sh) -d CONFIG_CLEAN_FILES = SOURCES = DIST_SOURCES = INFO_DEPS = $(srcdir)/autoconf.info $(srcdir)/standards.info -TEXINFO_TEX = $(top_srcdir)/config/texinfo.tex -am__TEXINFO_TEX_DIR = $(top_srcdir)/config +TEXINFO_TEX = $(top_srcdir)/build-aux/texinfo.tex +am__TEXINFO_TEX_DIR = $(top_srcdir)/build-aux DVIS = autoconf.dvi standards.dvi PDFS = autoconf.pdf standards.pdf PSS = autoconf.ps standards.ps @@ -233,7 +233,7 @@ autoconf.html: autoconf.texi $(srcdir)/version.texi $(autoconf_TEXINFOS) $(srcdir)/version.texi: $(srcdir)/stamp-vti $(srcdir)/stamp-vti: autoconf.texi $(top_srcdir)/configure @(dir=.; test -f ./autoconf.texi || dir=$(srcdir); \ - set `$(SHELL) $(top_srcdir)/config/mdate-sh $$dir/autoconf.texi`; \ + set `$(SHELL) $(top_srcdir)/build-aux/mdate-sh $$dir/autoconf.texi`; \ echo "@set UPDATED $$1 $$2 $$3"; \ echo "@set UPDATED-MONTH $$2 $$3"; \ echo "@set EDITION $(VERSION)"; \ diff --git a/doc/make-stds.texi b/doc/make-stds.texi index 7eb53d5ed..91a1ed030 100644 --- a/doc/make-stds.texi +++ b/doc/make-stds.texi @@ -12,7 +12,7 @@ @c 2004, 2005, 2006 Free Software Foundation, Inc. @c Permission is granted to copy, distribute and/or modify this document -@c under the terms of the GNU Free Documentation License, Version 1.1 +@c under the terms of the GNU Free Documentation License, Version 1.2 @c or any later version published by the Free Software Foundation; @c with no Invariant Sections, with no @c Front-Cover Texts, and with no Back-Cover Texts. @@ -39,8 +39,8 @@ conventions. * Makefile Basics:: General conventions for Makefiles. * Utilities in Makefiles:: Utilities to be used in Makefiles. * Command Variables:: Variables for specifying commands. -* Directory Variables:: Variables for installation directories. * DESTDIR:: Supporting staged installs. +* Directory Variables:: Variables for installation directories. * Standard Targets:: Standard targets for users. * Install Command Categories:: Three categories of commands in the `install' rule: normal, pre-install and post-install. @@ -264,7 +264,7 @@ Every Makefile should also define the variables @code{INSTALL_PROGRAM} and @code{INSTALL_DATA}. (The default for @code{INSTALL_PROGRAM} should be @code{$(INSTALL)}; the default for @code{INSTALL_DATA} should be @code{$@{INSTALL@} -m 644}.) Then it should use those variables as the -commands for actual installation, for executables and nonexecutables +commands for actual installation, for executables and non-executables respectively. Minimal use of these variables is as follows: @example @@ -296,17 +296,17 @@ $(INSTALL_PROGRAM) foo $(DESTDIR)$(bindir)/foo $(INSTALL_DATA) libfoo.a $(DESTDIR)$(libdir)/libfoo.a @end example -The @code{DESTDIR} variable is specified by the user, either to the -@file{configure} script or, more commonly, on the @code{make} command -line. For example: +The @code{DESTDIR} variable is specified by the user on the @code{make} +command line. For example: @example make DESTDIR=/tmp/stage install @end example @noindent -(Since the value of @code{DESTDIR} is only used during installation it -is not necessary to provide it with other @code{make} commands.) +@code{DESTDIR} should be supported only in the @code{install*} and +@code{uninstall*} targets, as those are the only targets where it is +useful. If your installation step would normally install @file{/usr/local/bin/foo} and @file{/usr/local/lib/libfoo.a}, then an @@ -334,8 +334,8 @@ to install into protected areas to build and install before gaining those permissions. Finally, it can be useful with tools such as @code{stow}, where code is installed in one place but made to appear to be installed somewhere else using symbolic links or special mount -operations. So, we recommend GNU packages support @code{DESTDIR}, -though it is not an absolute requirement. +operations. So, we strongly recommend GNU packages support +@code{DESTDIR}, though it is not an absolute requirement. @node Directory Variables @@ -564,8 +564,7 @@ write it as @samp{@@infodir@@}.) @code{infodir} is separate from @itemx pdfdir @itemx psdir Directories for installing documentation files in the particular -format. (It is not required to support documentation in all these -formats.) They should all be set to @code{$(docdir)} by default. (If +format. They should all be set to @code{$(docdir)} by default. (If you are using Autoconf, write them as @samp{@@htmldir@@}, @samp{@@dvidir@@}, etc.) Packages which supply several translations of their documentation should install them in @@ -642,7 +641,7 @@ And finally, you should set the following variable: @item srcdir The directory for the sources being compiled. The value of this variable is normally inserted by the @code{configure} shell script. -(If you are using Autconf, use @samp{srcdir = @@srcdir@@}.) +(If you are using Autoconf, use @samp{srcdir = @@srcdir@@}.) @end table For example: @@ -676,13 +675,13 @@ specify the exact same values for several different GNU packages. In order for this to be useful, all the packages must be designed so that they will work sensibly when the user does so. -Not all of these variables may be implemented in the current release -of Autoconf and/or Automake; right now, that includes at least -@code{docdir}, @code{psdir}, @code{pdfdir}, @code{htmldir}, -@code{dvidir}. In these cases, the descriptions here serve as -specifications for what Autoconf will implement. As a programmer, you -can either use a development version of Autoconf or avoid using these -variables until a stable release is made which supports them. +At times, not all of these variables may be implemented in the current +release of Autoconf and/or Automake; but as of Autoconf@tie{}2.60, we +believe all of them are. When any are missing, the descriptions here +serve as specifications for what Autoconf will implement. As a +programmer, you can either use a development version of Autoconf or +avoid using these variables until a stable release is made which +supports them. @node Standard Targets @@ -694,8 +693,9 @@ All GNU programs should have the following targets in their Makefiles: @item all Compile the entire program. This should be the default target. This target need not rebuild any documentation files; Info files should -normally be included in the distribution, and DVI files should be made -only when explicitly asked for. +normally be included in the distribution, and DVI (and other +documentation format) files should be made only when explicitly asked +for. By default, the Make rules should compile and link with @samp{-g}, so that executable programs have debugging symbols. Users who don't mind @@ -734,7 +734,7 @@ menu entry for the given Info file; it is part of the Texinfo package. Here is a sample rule to install an Info file: @comment This example has been carefully formatted for the Make manual. -@comment Please do not reformat it without talking to roland@gnu.ai.mit.edu. +@comment Please do not reformat it without talking to bug-make@gnu.org. @smallexample $(DESTDIR)$(infodir)/foo.info: foo.info $(POST_INSTALL) @@ -777,6 +777,10 @@ manuals, and you wish to install HTML documentation with many files certainly want to use subdirectories, or two nodes with the same name in different manuals will overwrite each other. +Please make these @code{install-@var{format}} targets invoke the +commands for the @var{format} target, for example, by making +@var{format} a dependency. + @item uninstall Delete all the installed files---the copies that the @samp{install} and @samp{install-*} targets create. @@ -902,7 +906,11 @@ because they will already be up to date. @itemx html @itemx pdf @itemx ps -Generate documentation files in the given format, if possible. +Generate documentation files in the given format. These targets +should always exist, but any or all can be a no-op if the given output +format cannot be generated. These targets should not be dependencies +of the @code{all} target; the user must manually invoke them. + Here's an example rule for generating DVI files from Texinfo: @smallexample diff --git a/doc/standards.texi b/doc/standards.texi index c9ddf36b5..68286df57 100644 --- a/doc/standards.texi +++ b/doc/standards.texi @@ -3,7 +3,7 @@ @setfilename standards.info @settitle GNU Coding Standards @c This date is automagically updated when you save this file: -@set lastupdate May 24, 2006 +@set lastupdate August 19, 2006 @c %**end of header @dircategory GNU organization @@ -36,7 +36,7 @@ Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. Permission is granted to copy, distribute and/or modify this document -under the terms of the GNU Free Documentation License, Version 1.1 +under the terms of the GNU Free Documentation License, Version 1.2 or any later version published by the Free Software Foundation; with no Invariant Sections, with no Front-Cover Texts, and with no Back-Cover Texts. @@ -886,7 +886,7 @@ be input files only; any output files would be specified using options (preferably @samp{-o} or @samp{--output}). Even if you allow an output file name as an ordinary argument for compatibility, try to provide an option as another way to specify it. This will lead to more consistency -among GNU utilities, and fewer idiosyncracies for users to remember. +among GNU utilities, and fewer idiosyncrasies for users to remember. @cindex standard command-line options @cindex options, standard command-line @@ -1943,7 +1943,7 @@ Every program accepting @item socket Specify a file descriptor for a network server to use for its socket, instead of opening and binding a new socket. This provides a way to -run, in a nonpriveledged process, a server that normally needs a +run, in a non-privileged process, a server that normally needs a reserved port number. @item sort @@ -2964,16 +2964,16 @@ sentence framework. Here is an example of what not to do: -@example +@smallexample printf ("%s is full", capacity > 5000000 ? "disk" : "floppy disk"); -@end example +@end smallexample If you apply gettext to all strings, like this, -@example +@smallexample printf (gettext ("%s is full"), capacity > 5000000 ? gettext ("disk") : gettext ("floppy disk")); -@end example +@end smallexample @noindent the translator will hardly know that "disk" and "floppy disk" are meant to @@ -3001,7 +3001,7 @@ printf ("# Implicit rule search has%s been done.\n", Adding @code{gettext} calls to this code cannot give correct results for all languages, because negation in some languages requires adding words at more than one place in the sentence. By contrast, adding -@code{gettext} calls does the job straightfowardly if the code starts +@code{gettext} calls does the job straightforwardly if the code starts out like this: @example @@ -3274,7 +3274,7 @@ should often make some general points that apply to several functions or variables. The previous descriptions of functions and variables in the section will also have given information about the topic. A description written to stand alone would repeat some of that information; this -redundance looks bad. Meanwhile, the informality that is acceptable in +redundancy looks bad. Meanwhile, the informality that is acceptable in a documentation string is totally unacceptable in a manual. The only good way to use documentation strings in writing a good manual @@ -3761,8 +3761,8 @@ the shell script @cindex optional features, configure-time Other options are permitted to specify in more detail the software -or hardware present on the machine, and include or exclude optional -parts of the package: +or hardware present on the machine, to include or exclude optional parts +of the package, or to adjust the name of some tools or arguments to them: @table @samp @item --enable-@var{feature}@r{[}=@var{parameter}@r{]} @@ -3795,14 +3795,32 @@ and Do not use a @samp{--with} option to specify the file name to use to find certain files. That is outside the scope of what @samp{--with} options are for. + +@item @var{variable}=@var{value} +Set the value of the variable @var{variable} to @var{value}. This is +used to override the default values of commands or arguments in the +build process. For example, the user could issue @samp{configure +CFLAGS=-g CXXFLAGS=-g} to build with debugging information and without +the default optimization. + +Specifying variables as arguments to @code{configure}, like this: +@example +./configure CC=gcc +@end example +is preferable to setting them in environment variables: +@example +CC=gcc ./configure +@end example +as it helps to recreate the same configuration later with +@file{config.status}. @end table -All @code{configure} scripts should accept all of these ``detail'' -options, whether or not they make any difference to the particular -package at hand. In particular, they should accept any option that -starts with @samp{--with-} or @samp{--enable-}. This is so users will -be able to configure an entire GNU source tree at once with a single set -of options. +All @code{configure} scripts should accept all of the ``detail'' +options and the variable settings, whether or not they make any +difference to the particular package at hand. In particular, they +should accept any option that starts with @samp{--with-} or +@samp{--enable-}. This is so users will be able to configure an +entire GNU source tree at once with a single set of options. You will note that the categories @samp{--with-} and @samp{--enable-} are narrow: they @strong{do not} provide a place for any sort of option diff --git a/lib/Autom4te/Makefile.in b/lib/Autom4te/Makefile.in index 8769410f9..a4b8a2820 100644 --- a/lib/Autom4te/Makefile.in +++ b/lib/Autom4te/Makefile.in @@ -38,11 +38,11 @@ subdir = lib/Autom4te DIST_COMMON = $(dist_perllib_DATA) $(srcdir)/Makefile.am \ $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/config/m4.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/m4/m4.m4 \ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) -mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs +mkinstalldirs = $(install_sh) -d CONFIG_CLEAN_FILES = SOURCES = DIST_SOURCES = diff --git a/lib/Makefile.in b/lib/Makefile.in index 2c85f897f..7432a0e4b 100644 --- a/lib/Makefile.in +++ b/lib/Makefile.in @@ -37,11 +37,11 @@ POST_UNINSTALL = : subdir = lib DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/config/m4.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/m4/m4.m4 \ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) -mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs +mkinstalldirs = $(install_sh) -d CONFIG_CLEAN_FILES = SOURCES = DIST_SOURCES = diff --git a/lib/autoconf/Makefile.in b/lib/autoconf/Makefile.in index ecb9dc688..2fbb1b31f 100644 --- a/lib/autoconf/Makefile.in +++ b/lib/autoconf/Makefile.in @@ -38,11 +38,11 @@ DIST_COMMON = $(dist_autoconflib_DATA) $(srcdir)/../freeze.mk \ $(srcdir)/Makefile.am $(srcdir)/Makefile.in subdir = lib/autoconf ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/config/m4.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/m4/m4.m4 \ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) -mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs +mkinstalldirs = $(install_sh) -d CONFIG_CLEAN_FILES = SOURCES = DIST_SOURCES = diff --git a/lib/autoscan/Makefile.in b/lib/autoscan/Makefile.in index 6cb4dd66d..e1aa565fe 100644 --- a/lib/autoscan/Makefile.in +++ b/lib/autoscan/Makefile.in @@ -38,11 +38,11 @@ DIST_COMMON = $(srcdir)/../freeze.mk $(srcdir)/Makefile.am \ $(srcdir)/Makefile.in subdir = lib/autoscan ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/config/m4.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/m4/m4.m4 \ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) -mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs +mkinstalldirs = $(install_sh) -d CONFIG_CLEAN_FILES = SOURCES = DIST_SOURCES = diff --git a/lib/autotest/Makefile.in b/lib/autotest/Makefile.in index 83193c074..b69809af1 100644 --- a/lib/autotest/Makefile.in +++ b/lib/autotest/Makefile.in @@ -38,11 +38,11 @@ DIST_COMMON = $(dist_autotestlib_DATA) $(srcdir)/../freeze.mk \ $(srcdir)/Makefile.am $(srcdir)/Makefile.in subdir = lib/autotest ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/config/m4.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/m4/m4.m4 \ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) -mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs +mkinstalldirs = $(install_sh) -d CONFIG_CLEAN_FILES = SOURCES = DIST_SOURCES = diff --git a/lib/emacs/Makefile.in b/lib/emacs/Makefile.in index 1d5717b1a..f1b51699e 100644 --- a/lib/emacs/Makefile.in +++ b/lib/emacs/Makefile.in @@ -38,11 +38,11 @@ subdir = lib/emacs DIST_COMMON = $(dist_lisp_LISP) $(srcdir)/Makefile.am \ $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/config/m4.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/m4/m4.m4 \ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) -mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs +mkinstalldirs = $(install_sh) -d CONFIG_CLEAN_FILES = SOURCES = DIST_SOURCES = @@ -58,7 +58,7 @@ LISP = $(dist_lisp_LISP) am__ELFILES = autoconf-mode.el autotest-mode.el am__ELCFILES = $(am__ELFILES:.el=.elc) ELCFILES = $(LISP:.el=.elc) -elisp_comp = $(top_srcdir)/config/elisp-comp +elisp_comp = $(top_srcdir)/build-aux/elisp-comp DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ AMTAR = @AMTAR@ diff --git a/lib/m4sugar/Makefile.in b/lib/m4sugar/Makefile.in index 271c947ee..3049ae212 100644 --- a/lib/m4sugar/Makefile.in +++ b/lib/m4sugar/Makefile.in @@ -14,6 +14,8 @@ @SET_MAKE@ +# Make Autoconf library for M4sugar. + srcdir = @srcdir@ top_srcdir = @top_srcdir@ VPATH = @srcdir@ @@ -454,11 +456,11 @@ version.m4: $(top_srcdir)/configure.ac echo '# Copyright (C) 1999, 2000, 2001, 2002'; \ echo '# Free Software Foundation, Inc.'; \ echo ;\ - echo 'm4_define([m4_PACKAGE_NAME], [@PACKAGE_NAME@])'; \ - echo 'm4_define([m4_PACKAGE_TARNAME], [@PACKAGE_TARNAME@])'; \ - echo 'm4_define([m4_PACKAGE_VERSION], [@PACKAGE_VERSION@])'; \ - echo 'm4_define([m4_PACKAGE_STRING], [@PACKAGE_STRING@])'; \ - echo 'm4_define([m4_PACKAGE_BUGREPORT], [@PACKAGE_BUGREPORT@])'; \ + echo 'm4_define([m4_PACKAGE_NAME], [$(PACKAGE_NAME)])'; \ + echo 'm4_define([m4_PACKAGE_TARNAME], [$(PACKAGE_TARNAME)])'; \ + echo 'm4_define([m4_PACKAGE_VERSION], [$(PACKAGE_VERSION)])'; \ + echo 'm4_define([m4_PACKAGE_STRING], [$(PACKAGE_STRING)])'; \ + echo 'm4_define([m4_PACKAGE_BUGREPORT], [$(PACKAGE_BUGREPORT)])'; \ } >version.m4 check-local: check-forbidden-patterns diff --git a/man/Makefile.in b/man/Makefile.in index 83a135139..50382d91d 100644 --- a/man/Makefile.in +++ b/man/Makefile.in @@ -13,6 +13,8 @@ # PARTICULAR PURPOSE. @SET_MAKE@ + +# Make Autoconf man pages. srcdir = @srcdir@ top_srcdir = @top_srcdir@ VPATH = @srcdir@ @@ -369,7 +371,7 @@ $(srcdir)/config.sub.1: $(top_srcdir)/build-aux/config.sub done;; \ esac echo "Updating man page $@" - PATH="$(top_builddir)/tests@PATH_SEPARATOR@$(top_srcdir)/build-aux@PATH_SEPARATOR@$$PATH"; \ + PATH="$(top_builddir)/tests$(PATH_SEPARATOR)$(top_srcdir)/build-aux$(PATH_SEPARATOR)$$PATH"; \ export PATH; \ $(HELP2MAN) \ --include=$*.x \ diff --git a/man/config.guess.1 b/man/config.guess.1 index 2925f1a61..030617d6b 100644 --- a/man/config.guess.1 +++ b/man/config.guess.1 @@ -1,5 +1,5 @@ .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.36. -.TH CONFIG.GUESS "1" "June 2006" "config.guess (2006-06-06)" "User Commands" +.TH CONFIG.GUESS "1" "August 2006" "config.guess (2006-07-02)" "User Commands" .SH NAME config.guess \- guess the build system triplet .SH SYNOPSIS diff --git a/man/config.sub.1 b/man/config.sub.1 index 76f672bf8..f30028c17 100644 --- a/man/config.sub.1 +++ b/man/config.sub.1 @@ -1,5 +1,5 @@ .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.36. -.TH CONFIG.SUB "1" "June 2006" "config.sub (2006-06-06)" "User Commands" +.TH CONFIG.SUB "1" "August 2006" "config.sub (2006-08-14)" "User Commands" .SH NAME config.sub \- validate and canonicalize a configuration triplet .SH SYNOPSIS @@ -7,7 +7,7 @@ config.sub \- validate and canonicalize a configuration triplet [\fIOPTION\fR] \fICPU-MFR-OPSYS\fR .SH DESCRIPTION .IP -\&../config/config.sub [OPTION] ALIAS +\&../build\-aux/config.sub [OPTION] ALIAS .PP Canonicalize a configuration name. .SS "Operation modes:" diff --git a/tests/Makefile.in b/tests/Makefile.in index a77681909..b1745f5d0 100644 --- a/tests/Makefile.in +++ b/tests/Makefile.in @@ -452,11 +452,11 @@ check-forbidden-patterns: $(srcdir)/package.m4: $(top_srcdir)/configure.ac { \ echo '# Signature of the current package.'; \ - echo 'm4_define([AT_PACKAGE_NAME], [@PACKAGE_NAME@])'; \ - echo 'm4_define([AT_PACKAGE_TARNAME], [@PACKAGE_TARNAME@])'; \ - echo 'm4_define([AT_PACKAGE_VERSION], [@PACKAGE_VERSION@])'; \ - echo 'm4_define([AT_PACKAGE_STRING], [@PACKAGE_STRING@])'; \ - echo 'm4_define([AT_PACKAGE_BUGREPORT], [@PACKAGE_BUGREPORT@])'; \ + echo 'm4_define([AT_PACKAGE_NAME], [$(PACKAGE_NAME)])'; \ + echo 'm4_define([AT_PACKAGE_TARNAME], [$(PACKAGE_TARNAME)])'; \ + echo 'm4_define([AT_PACKAGE_VERSION], [$(PACKAGE_VERSION)])'; \ + echo 'm4_define([AT_PACKAGE_STRING], [$(PACKAGE_STRING)])'; \ + echo 'm4_define([AT_PACKAGE_BUGREPORT], [$(PACKAGE_BUGREPORT)])'; \ } >$(srcdir)/package.m4 wrapper.in: $(srcdir)/wrapper.as $(m4sh_m4f_dependencies) @@ -499,7 +499,7 @@ $(TESTSUITE_GENERATED_AT): mktests.sh $(AUTOCONF_FILES) maintainer-check: maintainer-check-posix maintainer-check-c++ expr: echo '#! $(SHELL)' >expr - echo 'result=`@EXPR@ "$$@"`' >>expr + echo 'result=`$(EXPR) "$$@"`'>>expr echo 'estatus=$$?' >>expr echo 'cat <>expr echo '$${result:-0}' >>expr