From 3b3e9653139a9423e7d980cc6f9e3160111c9930 Mon Sep 17 00:00:00 2001
From: Eric Blake <ebb9@byu.net>
Date: Fri, 21 Mar 2008 22:29:37 -0600
Subject: [PATCH] Alter GNUmakefile to install into top directory.

* modules/maintainer-makefile: Split, and add dependency...
* modules/gnumakefile: to this new module.
* build-aux/GNUmakefile: Move...
* top/GNUmakefile: ...here.
* build-aux/maint.mk: Move...
* top/maint.mk: ...here.
* MODULES.html.sh (Support for maintaining...): Document new
module.

Signed-off-by: Eric Blake <ebb9@byu.net>
---
 ChangeLog                      | 12 ++++++++++++
 MODULES.html.sh                |  1 +
 modules/gnumakefile            | 32 ++++++++++++++++++++++++++++++++
 modules/maintainer-makefile    |  6 ++++--
 {build-aux => top}/GNUmakefile |  0
 {build-aux => top}/maint.mk    |  0
 6 files changed, 49 insertions(+), 2 deletions(-)
 create mode 100644 modules/gnumakefile
 rename {build-aux => top}/GNUmakefile (100%)
 rename {build-aux => top}/maint.mk (100%)

diff --git a/ChangeLog b/ChangeLog
index 6aad85264..fe72f6fab 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2008-03-24  Eric Blake  <ebb9@byu.net>
+
+	Alter GNUmakefile to install into top directory.
+	* modules/maintainer-makefile: Split, and add dependency...
+	* modules/gnumakefile: to this new module.
+	* build-aux/GNUmakefile: Move...
+	* top/GNUmakefile: ...here.
+	* build-aux/maint.mk: Move...
+	* top/maint.mk: ...here.
+	* MODULES.html.sh (Support for maintaining...): Document new
+	module.
+
 2008-03-23  Bruno Haible  <bruno@clisp.org>
 
 	* gnulib-tool: New options --vc-files, --no-vc-files.
diff --git a/MODULES.html.sh b/MODULES.html.sh
index 739f0d1cc..66147552f 100755
--- a/MODULES.html.sh
+++ b/MODULES.html.sh
@@ -2735,6 +2735,7 @@ func_all_modules ()
   func_module autobuild
   func_module git-version-gen
   func_module gitlog-to-changelog
+  func_module gnumakefile
   func_module gnupload
   func_module maintainer-makefile
   func_module mktempd
diff --git a/modules/gnumakefile b/modules/gnumakefile
new file mode 100644
index 000000000..af853442c
--- /dev/null
+++ b/modules/gnumakefile
@@ -0,0 +1,32 @@
+Description:
+Add GNU-make specific rules for maintainer use.
+
+Files:
+top/GNUmakefile
+
+Depends-on:
+
+configure.ac:
+# Autoconf 2.61a.99 and earlier don't support linking a file only
+# in VPATH builds.  But since GNUmakefile is for maintainer use
+# only, it does not matter if we skip the link with older autoconf.
+# Automake 1.10.1 and earlier try to remove GNUmakefile in non-VPATH
+# builds, so use a shell variable to bypass this.
+GNUmakefile=GNUmakefile
+m4_if(m4_version_compare([2.61a.100],
+	m4_defn([m4_PACKAGE_VERSION])), [1], [],
+      [AC_CONFIG_LINKS([$GNUmakefile:$GNUmakefile], [],
+	[GNUmakefile=$GNUmakefile])])
+
+Makefile.am:
+distclean-local: clean-GNUmakefile
+clean-GNUmakefile:
+	if test x"$(VPATH)" != x ; then rm -f $(top_srcdir)/GNUmakefile ; fi
+
+Include:
+
+License:
+GPLed build tool
+
+Maintainer:
+coreutils
diff --git a/modules/maintainer-makefile b/modules/maintainer-makefile
index f35cd2356..492ca69bb 100644
--- a/modules/maintainer-makefile
+++ b/modules/maintainer-makefile
@@ -2,8 +2,10 @@ Description:
 Helper GNUmakefile with syntax checks, build improvements, etc.
 
 Files:
-build-aux/GNUmakefile
-build-aux/maint.mk
+top/maint.mk
+
+Depends-on:
+gnumakefile
 
 License:
 GPLed build tool
diff --git a/build-aux/GNUmakefile b/top/GNUmakefile
similarity index 100%
rename from build-aux/GNUmakefile
rename to top/GNUmakefile
diff --git a/build-aux/maint.mk b/top/maint.mk
similarity index 100%
rename from build-aux/maint.mk
rename to top/maint.mk
-- 
2.11.0