Get rid of the tols/ directory:

- move config.guess and config.sub from tools/ into scripts/
- update the scripts and makefile fragments accordingly

 /trunk/Makefile.in        |   10     5     5     0 +++++-----
 /trunk/scripts/functions  |   16     8     8     0 ++++++++--------
 /trunk/scripts/scripts.mk |   28    13    15     0 +++++++++++++---------------
 /trunk/ct-ng.in           |    4     2     2     0 ++--
 4 files changed, 28 insertions(+), 30 deletions(-)

1 files changed, 55 insertions, 0 deletions

diff --git a/scripts/scripts.mk b/scripts/scripts.mk
new file mode 100644
index 00000000..ebb05e4b
--- /dev/null
+++ b/scripts/scripts.mk
@@ -0,0 +1,55 @@
+# Makefile for the scripts/ sub-directory
+
+# Here, we can update the config.* scripts.
+# If we're in CT_LIB_DIR, then CT_LIB_DIR == CT_TOP_DIR, and we can update those
+# scripts for later inclusion mainline. If CT_LIB_DIR != CT_TOP_DIR, then those
+# scripts are downloaded only for use in CT_TOP_DIR.
+
+# ----------------------------------------------------------
+# The tools help entry
+
+help-distrib::
+	@echo  '  updatetools        - Update the config tools'
+
+# ----------------------------------------------------------
+# Where to get tools from, and where to store them into
+# The tools are: config.guess and config.sub
+
+CONFIG_SUB_SRC="http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD"
+CONFIG_SUB_DEST=scripts/config.sub
+CONFIG_GUESS_SRC="http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD"
+CONFIG_GUESS_DEST=scripts/config.guess
+
+PHONY += updatetools
+updatetools: $(CONFIG_SUB_DEST) $(CONFIG_GUESS_DEST)
+
+# ----------------------------------------------------------
+# How to retrieve the tools
+
+wget_opt=-o /dev/null
+ifeq ($(strip $(V)),2)
+  wget_opt=
+endif
+
+PHONY += scripts
+scripts:
+	$(SILENT)mkdir -p scripts
+
+FROCE += $(CONFIG_SUB_DEST)
+$(CONFIG_SUB_DEST): scripts
+	@$(ECHO) '  WGET  $@'
+	$(SILENT)wget $(wget_opt) -O $@ $(CONFIG_SUB_SRC)
+	$(SILENT)chmod u+rwx,go+rx-w $@
+
+FORCE += $(CONFIG_GUESS_DEST)
+$(CONFIG_GUESS_DEST): scripts
+	@$(ECHO) '  WGET  $@'
+	$(SILENT)wget $(wget_opt) -O $@ $(CONFIG_GUESS_SRC)
+	$(SILENT)chmod u+rwx,go+rx-w $@
+
+# ----------------------------------------------------------
+# Clean up the mess
+
+distclean::
+	@$(ECHO) "  CLEAN scripts"
+	$(SILENT)[ $(CT_TOP_DIR) = $(CT_LIB_DIR) ] || rm -rf $(CT_TOP_DIR)/scripts