normalized perms on all files, to avoid relying on any stored executable bits in...

[feisty_meow.git] / scripts / clam / cpp / preconditions.sh

diff --git a/scripts/clam/cpp/preconditions.sh b/scripts/clam/cpp/preconditions.sh
old mode 100755 (executable)
new mode 100644 (file)
index 0c1da34..1197a22
--- a/scripts/clam/cpp/preconditions.sh
+++ b/scripts/clam/cpp/preconditions.sh
@@ -2,7 +2,7 @@
 # prepares the project for compilation by creating the appropriate directories.
 
 # make sure our temp directory is there.
-if [ ! -d $CLAM_TMP ]; then mkdir $CLAM_TMP; fi
+if [ ! -d $CLAM_TMP ]; then mkdir -p $CLAM_TMP; fi
 
 # if the clean flag is defined, then we need to quit.  we should not be
 # creating directories or doing other tasks for a build that is really
@@ -12,28 +12,28 @@ if [ ! -z "$CLEAN" ]; then
 fi
 
 # make sure generated files have a home.
-if [ ! -d $TARGETS_DIR ]; then mkdir $TARGETS_DIR; fi
+if [ ! -d $TARGETS_DIR ]; then mkdir -p $TARGETS_DIR; fi
 # create the generated files storage area.
-if [ ! -d $OUTPUT_ROOT ]; then mkdir $OUTPUT_ROOT; fi
+if [ ! -d $OUTPUT_ROOT ]; then mkdir -p $OUTPUT_ROOT; fi
 # create the top level object directory if it doesn't exist.
-if [ ! -d $BASE_OUTPUT_PATH ]; then mkdir $BASE_OUTPUT_PATH; fi
+if [ ! -d $BASE_OUTPUT_PATH ]; then mkdir -p $BASE_OUTPUT_PATH; fi
 # create the project level object directory if it is non-existent.
-if [ ! -d $OUTPUT_PATH ]; then mkdir $OUTPUT_PATH; fi
+if [ ! -d $OUTPUT_PATH ]; then mkdir -p $OUTPUT_PATH; fi
 # create a directory to hold any debugging files, if necessary.
-if [ ! -d $PDB_DIR ]; then mkdir $PDB_DIR; fi
+if [ ! -d $PDB_DIR ]; then mkdir -p $PDB_DIR; fi
 #
 ####if [ ! -d $TESTS_DIR ]; then mkdir $TESTS_DIR; fi
 #
-if [ ! -d $EXECUTABLE_DIR ]; then mkdir $EXECUTABLE_DIR; fi
+if [ ! -d $EXECUTABLE_DIR ]; then mkdir -p $EXECUTABLE_DIR; fi
 #
-if [ ! -d $DYNAMIC_LIBRARY_DIR ]; then mkdir $DYNAMIC_LIBRARY_DIR; fi
+if [ ! -d $DYNAMIC_LIBRARY_DIR ]; then mkdir -p $DYNAMIC_LIBRARY_DIR; fi
 #
-if [ ! -d $STATIC_LIBRARY_DIR ]; then mkdir $STATIC_LIBRARY_DIR; fi
+if [ ! -d $STATIC_LIBRARY_DIR ]; then mkdir -p $STATIC_LIBRARY_DIR; fi
 
 # set versions on any extras that were specified in the makefile.
 if [ ! -z "$EXTRA_VERSIONS" ]; then
   for i in $EXTRA_VERSIONS; do
-    $CLAM_BIN/version_stamper$EXE_END $i $PARAMETER_FILE
+    $CLAM_BINARY_DIR/version_stamper$EXE_END $i $PARAMETER_FILE
   done
 fi