From f4a65bd2d9b511bfc306031977fb574defed6348 Mon Sep 17 00:00:00 2001
From: Richard Brooksby <rb@ravenbrook.com>
Date: Sun, 9 Sep 2012 19:39:57 +0100
Subject: [PATCH] Adding short name and link to configure.ac.

Attempting to link code/GNUmakefile when configure is run, so that invocations of make become easy.

Copied from Perforce
 Change: 179369
 ServerID: perforce.ravenbrook.com
---
 mps/Makefile.in  | 39 ---------------------------------------
 mps/configure.ac | 13 ++++++++++---
 2 files changed, 10 insertions(+), 42 deletions(-)

diff --git a/mps/Makefile.in b/mps/Makefile.in
index b734a3cafa7..e69de29bb2d 100644
--- a/mps/Makefile.in
+++ b/mps/Makefile.in
@@ -1,39 +0,0 @@
-# Makefile.in -- source for autoconf Makefile
-#
-# $Id$
-# Copyright (C) 2012 Ravenbrook Limited.  See end of file for license.
-#
-# YOU DON"T NEED AUTOCONF TO BUILD THE MPS
-# This is just here for people who want or expect a configure script.
-# See [Building the Memory Pool System](manual/build.txt) for how best
-# to build and integrate the MPS.
-#
-
-MPS_TARGET_PF=@MPS_TARGET_PF@
-MPS_TARGET_NAME=@MPS_TARGET_NAME@
-
-BUILD_TARGET=build-via-make
-CLEAN_TARGET=clean-make-build
-
-all: $(BUILD_TARGET)
-	$(BUILD)
-
-build-via-make:
-	$(MAKE) -C code -f $(MPS_TARGET_NAME).gmk
-
-clean-make-build:
-	rm -r code/$(MPS_TARGET_NAME)/
-
-build-via-xcode:
-	xcodebuild -project code/mps.xcodeproj
-
-clean-xcode-build:
-	rm -r code/build/
-
-Makefile: Makefile.in config.status
-	./config.status Makefile
-
-clean: $(CLEAN_TARGET)
-
-distclean: clean
-	rm -rf autom4te.cache/ config.log config.status configure Makefile
diff --git a/mps/configure.ac b/mps/configure.ac
index 4457902ea6b..b3601acc7df 100644
--- a/mps/configure.ac
+++ b/mps/configure.ac
@@ -3,7 +3,7 @@
 # $Id$
 # Copyright (C) 2012 Ravenbrook Limited.  See end of file for license.
 #
-# YOU DON"T NEED AUTOCONF TO BUILD THE MPS
+# YOU DON'T NEED AUTOCONF TO BUILD THE MPS
 # This is just here for people who want or expect a configure script.
 # See [Building the Memory Pool System](manual/build.txt) for how best
 # to build and integrate the MPS.
@@ -14,9 +14,15 @@
 #
 
 AC_PREREQ([2.50])
-AC_INIT([Memory Pool System], [master], [mps-questions@ravenbrook.com])
+AC_INIT([Memory Pool System Kit],
+        [master],
+        [mps-questions@ravenbrook.com],
+        [mps-kit],
+        [http://www.ravenbrook.com/project/mps/])
 AC_CONFIG_AUX_DIR(build-aux)
 AC_CONFIG_SRCDIR([code/mps.c])
+AC_REVISION([$Id$])
+
 
 # Checks for programs.
 AC_PROG_CC
@@ -57,11 +63,12 @@ case $host in
       MPS_TARGET_NAME=fri6gc
     ;;
   *)
-    AC_MSG_ERROR([MPS does not yet support this platform.])
+    AC_MSG_ERROR([MPS Kit does not support this platform out of the box.  See manual/build.txt])
 esac
 
 AC_SUBST(MPS_TARGET_PF)
 AC_SUBST(MPS_TARGET_NAME)
 AC_CONFIG_FILES(Makefile)
+AC_CONFIG_LINKS([code/GNUmakefile:code/]MPS_TARGET_NAME[.gmk])
 
 AC_OUTPUT