Tom's changes to add configuration option

gmake <config>[-config] THORNLIST=<file name>

to use a given file as the thorn list for that configuration.

This needs to be tweaked to do something if the file to be copied doesn't
exist, but I'm still wondering whether to exit with an error, prompt for
another filename or do the default of making the thornlist from all the
available thorns. Also, it might be useful to give a warning if it
includes thorns which are not available, and also to still give you
a chance to edit the file.


git-svn-id: http://svn.cactuscode.org/flesh/trunk@1261 17b73243-c579-4c4c-a9d2-2d5706c11dac

1 files changed, 17 insertions, 2 deletions

diff --git a/Makefile b/Makefile
index e37aa453..305c07de 100644
--- a/Makefile
+++ b/Makefile
@@ -16,7 +16,7 @@
 #
 #   
 #   @enddesc 
-#   @version $Id: Makefile,v 1.63 2000-01-04 11:45:27 allen Exp $
+#   @version $Id: Makefile,v 1.64 2000-01-16 10:55:55 allen Exp $
 # @@*/
 
 ##################################################################################
@@ -518,9 +518,17 @@ ifneq ($strip($(CONFIGURATIONS)),)
 .PHONY $(addsuffix -config,$(CONFIGURATIONS)):
 
 $(addsuffix -config,$(CONFIGURATIONS)):
-	@echo $(DIVIDER)
+	echo $(DIVIDER)
 	$(SETUP_ENV) $(PERL) -s $(SETUP) -reconfig=1 $(SETUP_OPTIONS) $(@:%-config=%); 
+	@echo $(DIVIDER);
+	@echo Use $(MAKE) $(@:%-config=%) to build the configuration.
+	@echo $(DIVIDER)
+ifneq ($(strip $(THORNLIST)),)
+	cp $(THORNLIST) $(CONFIGS_DIR)/$(@:%-config=%)/ThornList
 endif
+endif
+
+# FIXME: What is this bit? Is it used? 
 
 %-config:
 	@echo $(DIVIDER)
@@ -537,6 +545,10 @@ endif
 	echo Use $(MAKE) $(@:%-config=%) to build the configuration.; \
 	fi 
 	@echo $(DIVIDER)
+ifneq ($(strip $(THORNLIST)),)
+	cp $(THORNLIST) $(CONFIGS_DIR)/$@/ThornList
+endif
+
 
 # Make a new thorn
 
@@ -686,4 +698,7 @@ downsize:
 	echo Use $(MAKE) $@ to build the configuration.; \
 	fi 
 	@echo $(DIVIDER)
+ifneq ($(strip $(THORNLIST)),)
+	@cp $(THORNLIST) $(CONFIGS_DIR)/$@/ThornList
+endif