Rename directory build/ to am_include/

This is in preparation for building mm-common with meson in the near future.

When jhbuild is used for building a module with meson, and the user has
requested builddir==srcdir, which meson forbids, jhbuild creates
a $srcdir/build directory and builds there, even if there already is such
a directory, used for other purposes.

6 files changed, 21 insertions, 21 deletions

diff --git a/Makefile.am b/Makefile.am
index 3fe0f3d..49858c9 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -25,10 +25,10 @@ man1_MANS = util/mm-common-prepare.1
 # into projects at autogen.sh time:
 build_supportdir = $(pkgdatadir)/build
 dist_build_support_DATA =		\
-	build/compile-binding.am	\
-	build/dist-changelog.am		\
-	build/doc-reference.am		\
-	build/generate-binding.am
+	am_include/compile-binding.am	\
+	am_include/dist-changelog.am		\
+	am_include/doc-reference.am		\
+	am_include/generate-binding.am
 
 # These are installed so that aclocal can copy them into aclocal.m4
 # at autogen.sh time:
@@ -45,7 +45,7 @@ dist_aclocal_macro_DATA =		\
 
 # These are installed so that mm-common-prepare can copy them into projects
 # at autogen.sh time if a directory path is given to MM_CONFIG_DOCTOOL_DIR(),
-# or they can be found via pkg-config --variable=doctooldir mm-common,
+# or they can be found via pkg-config --variable=doctooldir mm-common-util,
 # which is preferrable.
 doctooldir = $(pkgdatadir)/doctool
 dist_doctool_DATA =			\
@@ -165,7 +165,7 @@ util/mm-common-prepare.1: $(srcdir)/util/mm-common-prepare.1.in Makefile
 skeletonmm.tar.gz: $(skeletonmm_files)
 	$(AM_V_GEN)($(srctar_stdout) $(skeletonmm_files)) | gzip -c -n >$@
 
-include $(top_srcdir)/build/dist-changelog.am
+include $(top_srcdir)/am_include/dist-changelog.am
 
 install-data-hook: $(if $(DESTDIR),,postinst-acdir-notice)
 
diff --git a/README b/README
index b942398..3208f4f 100644
--- a/README
+++ b/README
@@ -67,10 +67,10 @@ in the ${datadir}/aclocal directory.  Since all used M4 macros are copied
 into aclocal.m4, these macro files are required only in maintainer-mode.
 For this reason, they are not copied into the source tree of a project by
 mm-common-prepare.  If mm-common is installed to a different prefix than
-Automake, it may be necessary to adjust ACLOCAL_FLAGS accordingly so that
+Automake, it may be necessary to adjust ACLOCAL_PATH accordingly so that
 aclocal can find the M4 files:
 
-  export ACLOCAL_FLAGS="-I ${mm_common_prefix}/share/aclocal"
+  export ACLOCAL_PATH="${mm_common_prefix}/share/aclocal"
 
 This step is not necessary when using jhbuild, as it takes care of setting
 up the environment for using the locally built modules.
@@ -123,27 +123,27 @@ macros/mm-ax_cxx_compile_stdcxx.m4:
 Automake include files
 ----------------------
 
-The Automake include files are located in the build/ directory.  The
-installed mm-common-prepare program copies all of the .am files into
+The Automake include files are located in the am_include/ directory.
+The installed mm-common-prepare program copies all of the .am files into
 a project's source tree.  If AC_CONFIG_AUX_DIR([...]) is specified in
 the configure.ac file, the .am files will be placed in the indicated
 subdirectory.
 
-build/generate-binding.am:
-  Variables and rules for running the gmmproc code generate to produce
+am_include/generate-binding.am:
+  Variables and rules for running the gmmproc code generator to produce
   the source code files for a C++ binding module.
 
-build/compile-binding.am:
+am_include/compile-binding.am:
   Variables and rules for compiling and linking the shared library which
   implements a C++ binding module.
 
-build/doc-reference.am:
+am_include/doc-reference.am:
   Variables and rules for building the API reference documentation using
   Doxygen, and to create a Devhelp book for the library.  The installation
   rules also take care of translating references to external documentation
   in the generated hypertext documents.
 
-build/dist-changelog.am:
+am_include/dist-changelog.am:
   A dist-hook rule to automatically generate a ChangeLog file when making
   a release, intended to be used by modules which use the version control
   log exclusively to document changes.
@@ -155,12 +155,12 @@ These are two Perl scripts, a style sheet, and one XSL transformation
 which assist with the task of generating and installing the Doxygen
 reference documentation.  At least doc-install.pl is also required for
 tarball builds.
-To avoid copying these files into all binding modules, they are also
-distributed and installed with the glibmm module.  Those binding modules
-which cannot depend on glibmm must call MM_CONFIG_DOCTOOL_DIR([...]) in
-configure.ac to indicate to mm-common-prepare that it should copy the
-documentation utilities into the project's source tree.  Otherwise the
-files installed with glibmm will be used automatically.
+To avoid copying these files into all binding modules, they are
+distributed and installed with the mm-common module.  Those binding modules
+which shall depend on mm-common only in maintainer-mode must call
+MM_CONFIG_DOCTOOL_DIR([...]) in configure.ac to indicate to mm-common-prepare
+that it should copy the documentation utilities into the project's source tree.
+Otherwise the files installed with mm-common will be used automatically.
 
 util/doc-postprocess.pl:
   A simple script to post-process the HTML files generated by Doxygen.
diff --git a/build/compile-binding.am b/am_include/compile-binding.am
index c8a1e35..c8a1e35 100644
--- a/build/compile-binding.am
+++ b/am_include/compile-binding.am
diff --git a/build/dist-changelog.am b/am_include/dist-changelog.am
index a3a2748..a3a2748 100644
--- a/build/dist-changelog.am
+++ b/am_include/dist-changelog.am
diff --git a/build/doc-reference.am b/am_include/doc-reference.am
index da5642a..da5642a 100644
--- a/build/doc-reference.am
+++ b/am_include/doc-reference.am
diff --git a/build/generate-binding.am b/am_include/generate-binding.am
index fe9886d..fe9886d 100644
--- a/build/generate-binding.am
+++ b/am_include/generate-binding.am