Create the scratch directories in the configurations when the

configuration is created, not when it is built.  This allows make to
examine this directory for dependencies.  (Make refuses to examine
non-existing directories.)


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

2 files changed, 4 insertions, 4 deletions

diff --git a/lib/make/make.configuration b/lib/make/make.configuration
index a1641880..2d7c21c0 100644
--- a/lib/make/make.configuration
+++ b/lib/make/make.configuration
@@ -273,7 +273,7 @@ editthorns:
 clean:
 	@echo Deleting all object and dependency files in $(TOP)
 	find $(TOP) \( -name '*.[od]' -o -name '*.a' \) -exec rm {} \;
-	rm -rf $(TOP)/scratch
+	rm -rf $(TOP)/scratch; $(MKDIR) $(MKDIRFLAGS) $(TOP)/scratch
 
 cleandeps:
 	@echo Deleting all dependency files in $(TOP)
@@ -282,7 +282,7 @@ cleandeps:
 cleanobjs:
 	@echo Deleting all object files in $(TOP)
 	find $(TOP) \( -name '*.[o]' -o -name '*.a' \) -exec rm {} \;
-	rm -rf $(TOP)/scratch
+	rm -rf $(TOP)/scratch; $(MKDIR) $(MKDIRFLAGS) $(TOP)/scratch
 
 realclean:
 	@echo Deleting all built files in $(TOP)
@@ -290,7 +290,7 @@ realclean:
 	rm -rf $(TOP)/bindings
 	rm -rf $(TOP)/config-data/make.thornlist
 	rm -rf $(TOP)/lib/*
-	rm -rf $(TOP)/scratch
+	rm -rf $(TOP)/scratch; $(MKDIR) $(MKDIRFLAGS) $(TOP)/scratch
 	rm -f datestamp.o
 
 # This target will build only a subset of the thorns for a given configuration.
diff --git a/lib/make/setup_configuration.pl b/lib/make/setup_configuration.pl
index 1595763f..e514cb06 100755
--- a/lib/make/setup_configuration.pl
+++ b/lib/make/setup_configuration.pl
@@ -60,7 +60,7 @@ if (! -d "$config" && ! -l "$config")
 {
   print "Creating new configuration $config.\n";
 
-  for $dir ("$config", "$config/build", "$config/lib", "$config/config-data")
+  for $dir ("$config", "$config/build", "$config/lib", "$config/scratch", "$config/config-data")
   {
     mkdir("$dir",0755) || die "Internal error - couldn't create $dir";
   }