Savannah Git Hosting - m4.git/commitdiff

diff --git a/.cvsignore b/.cvsignore

index 1b25efacfdaa1202e10910d16e63f75f11b56bd5..f36af79dd4ff5ff1048e5c3047b24c55814a58fe 100644 (file)

--- a/.cvsignore

+++ b/.cvsignore

aclocal.m4

aclocal.m4t

autom4te.cache

+build-aux

config.cache

config.h

config-h.in

diff --git a/.gitignore b/.gitignore

index ed1f298b5be5e57d48a490658b904ef2efd37031..21bfd603f38257e86a85508967f64268840358d1 100644 (file)

--- a/.gitignore

+++ b/.gitignore

aclocal.m4

aclocal.m4t

autom4te.cache

+build-aux

config.cache

config.h

config-h.in

diff --git a/ChangeLog b/ChangeLog

index d4c01572c6124ba83a989c4b6544fc50c5893537..1526687ee537de5267aabb176af4092a61b22b3a 100644 (file)

--- a/ChangeLog

+++ b/ChangeLog

+2007年11月05日 Eric Blake <ebb9@byu.net>

+

+ For consistency with other GNU projects, use build-aux directory.

+ * configure.ac (AC_CONFIG_AUX_DIR): Change ltdl/config to

+ build-aux.

+ * bootstrap (config_aux_dir): Likewise.

+ * Makefile.am (config_aux_dir): Likewise.

+ * ltdl/m4/gnulib-cache.m4: Use --aux-dir option.

+

2007年11月02日 Eric Blake <ebb9@byu.net>

Update some documentation about version control.

diff --git a/Makefile.am b/Makefile.am

index d9f107fe3784afb930a831c5e3a806416cc2f766..a2e67d98b8cd94e0d888bd360c612501afb944df 100644 (file)

--- a/Makefile.am

+++ b/Makefile.am

##

## Written by Gary V. Vaughan <gary@gnu.org>

-config_aux_dir = ltdl/config

+config_aux_dir = build-aux

config_macro_dir= ltdl/m4

SUBDIRS = ltdl po gnu tests/gnu .

diff --git a/bootstrap b/bootstrap

index 4f453b4df1e7e4ea34deac2f3a3900b1149757b2..140ed0ed785a33773026dcb2e6bef8905328249e 100755 (executable)

--- a/bootstrap

+++ b/bootstrap

#! /bin/sh

-# bootstrap (GNU M4) version 2007-11-02

+# bootstrap (GNU M4) version 2007-11-05

# Written by Gary V. Vaughan <gary@gnu.org>

# Copyright (C) 2004, 2005, 2006, 2007 Free Software Foundation, Inc.

package=m4

ltdldir=ltdl

-config_aux_dir=$ltdldir/config

+config_aux_dir=build-aux

config_macro_dir=$ltdldir/m4

bailout_cb=:

diff --git a/configure.ac b/configure.ac

index 1dce77aa876012d8546e8e7ce12e8a0c4bd3b554..d9790e92fba17e387fe46352d559ff13ceba46e7 100644 (file)

--- a/configure.ac

+++ b/configure.ac

AC_INIT([GNU M4], [1.9a], [bug-m4@gnu.org])

AC_CONFIG_SRCDIR([src/m4.h])

-AC_CONFIG_AUX_DIR([ltdl/config])

+AC_CONFIG_AUX_DIR([build-aux])

AC_CONFIG_MACRO_DIR([ltdl/m4])

AC_CONFIG_LIBOBJ_DIR([gnu])

AC_CONFIG_TESTDIR([tests])

diff --git a/ltdl/m4/gnulib-cache.m4 b/ltdl/m4/gnulib-cache.m4

index 927082e8aff09f19f6dc4e671b34b8a13d468b77..9c17a78b8ee2b25e3ed2250bf6047f6837ca7487 100644 (file)

--- a/ltdl/m4/gnulib-cache.m4

+++ b/ltdl/m4/gnulib-cache.m4

# Specification in the form of a command-line invocation:

-# gnulib-tool --import --dir=. --local-dir=local --lib=libgnu --source-base=gnu --m4-base=ltdl/m4 --doc-base=doc --aux-dir=ltdl/config --with-tests --libtool --macro-prefix=M4 assert autobuild avltree-oset binary-io clean-temp cloexec close-stream closein config-h configmake dirname error exit fdl fflush filenamecat fopen-safer free fseeko gendocs gettext gnupload gpl-3.0 mkstemp obstack progname regex regexprops-generic sprintf-posix stdbool stdlib-safer strnlen strtol tempname unlocked-io verror xalloc xalloc-die xprintf-posix xstrndup xvasprintf-posix

+# gnulib-tool --import --dir=. --local-dir=local --lib=libgnu --source-base=gnu --m4-base=ltdl/m4 --doc-base=doc --aux-dir=build-aux --with-tests --libtool --macro-prefix=M4 assert autobuild avltree-oset binary-io clean-temp cloexec close-stream closein config-h configmake dirname error exit fdl fflush filenamecat fopen-safer free fseeko gendocs gettext gnupload gpl-3.0 mkstemp obstack progname regex regexprops-generic sprintf-posix stdbool stdlib-safer strnlen strtol tempname unlocked-io verror xalloc xalloc-die xprintf-posix xstrndup xvasprintf-posix

# Specification in the form of a few gnulib-tool.m4 macro invocations:

gl_LOCAL_DIR([local])