4 files changed, 23 insertions, 2 deletions
diff --git a/lib/make/config.h.in b/lib/make/config.h.in
index 245c8da1..6c718c78 100644
--- a/lib/make/config.h.in
+++ b/lib/make/config.h.in
@@ -60,6 +60,7 @@
 /* How to create a directory */
 
 #undef MKDIR
+#undef MKDIRFLAGS
 
 /******************************************************************************/
 
diff --git a/lib/make/configure b/lib/make/configure
index 905db31f..c62f40ed 100755
--- a/lib/make/configure
+++ b/lib/make/configure
@@ -2331,10 +2331,20 @@ EOF
 # Define how to make a directory in the config.h file
 
 cat >> confdefs.h <<EOF
-#define MKDIR $MKDIR
+#define MKDIR "$MKDIR "
 EOF
  
 
+
+
+: ${MKDIRFLAGS="-p"}
+
+cat >> confdefs.h <<EOF
+#define MKDIRFLAGS " $MKDIRFLAGS "
+EOF
+ 
+
+
 # The perl scripts run by the make system need to have their names
 # changed if under cygwin - e.g. //d/foo needs to be d:/foo
 
@@ -2594,6 +2604,7 @@ s%@BUILD_DIR@%$BUILD_DIR%g
 s%@CCTK_LIBDIR@%$CCTK_LIBDIR%g
 s%@EXEDIR@%$EXEDIR%g
 s%@EXE@%$EXE%g
+s%@MKDIRFLAGS@%$MKDIRFLAGS%g
 s%@BUILD_ACTIVETHORNS@%$BUILD_ACTIVETHORNS%g
 s%@CST@%$CST%g
 s%@F_FILE_PROCESSOR@%$F_FILE_PROCESSOR%g
diff --git a/lib/make/configure.in b/lib/make/configure.in
index 03f52d66..e17b2982 100644
--- a/lib/make/configure.in
+++ b/lib/make/configure.in
@@ -329,7 +329,14 @@ AC_DEFINE_UNQUOTED(FMODIFIER, $FMODIFIER)
 
 # Define how to make a directory in the config.h file
 
-AC_DEFINE_UNQUOTED(MKDIR, $MKDIR) 
+AC_DEFINE_UNQUOTED(MKDIR, "$MKDIR ") 
+
+AC_SUBST(MKDIRFLAGS)
+
+: ${MKDIRFLAGS="-p"}
+
+AC_DEFINE_UNQUOTED(MKDIRFLAGS, " $MKDIRFLAGS ") 
+
 
 # The perl scripts run by the make system need to have their names
 # changed if under cygwin - e.g. //d/foo needs to be d:/foo
diff --git a/lib/make/make.config.defn.in b/lib/make/make.config.defn.in
index 8401775a..9a407179 100644
--- a/lib/make/make.config.defn.in
+++ b/lib/make/make.config.defn.in
@@ -35,6 +35,8 @@ CXXFLAGS          = @CXXFLAGS@
 F90FLAGS          = @F90FLAGS@
 F77FLAGS          = @F77FLAGS@
 
+MKDIRFLAGS          = @MKDIRFLAGS@
+
 LDFLAGS           = @LDFLAGS@
 
 ARFLAGS           = @ARFLAGS@