X-Git-Url: https://feistymeow.org/gitweb/?a=blobdiff_plain;f=scripts%2Fclam%2Fcpp%2Fpostconditions.sh;h=174529a2576697f294bf7edd48daa7c06e94b47a;hb=c02e632d0e6514ccaad532b79022e9172a3cd00b;hp=90e96578c04d2e2d02d094022f86152b75216e85;hpb=abad259144d11f1a8a752f14ae8a79968a073c89;p=feisty_meow.git diff --git a/scripts/clam/cpp/postconditions.sh b/scripts/clam/cpp/postconditions.sh index 90e96578..174529a2 100755 --- a/scripts/clam/cpp/postconditions.sh +++ b/scripts/clam/cpp/postconditions.sh @@ -10,7 +10,7 @@ fi if [ -f $FAILURE_FILE ]; then echo Postconditions will not promote due to a failure: cat $FAILURE_FILE - . $CLAM_DIR/exit_make.sh + . $CLAM_SCRIPTS/exit_make.sh fi # make sure that we actually did something during the make. @@ -23,15 +23,15 @@ fi for i in *.resources; do rm -f "$i"; done # causes the shell to quit. -DIE="source $CLAM_DIR/exit_make.sh" +DIE="source $CLAM_SCRIPTS/exit_make.sh" -if [ ! -d $TARGETS_DIR ]; then mkdir $TARGETS_DIR; fi +if [ ! -d $TARGETS_STORE ]; then mkdir -p $TARGETS_STORE; fi if [ "$TYPE" = "library" ]; then # make sure the required directories exist. - if [ ! -d $STATIC_LIBRARY_DIR ]; then mkdir $STATIC_LIBRARY_DIR; fi - if [ ! -d $DYNAMIC_LIBRARY_DIR ]; then mkdir $DYNAMIC_LIBRARY_DIR; fi + if [ ! -d $STATIC_LIBRARY_DIR ]; then mkdir -p $STATIC_LIBRARY_DIR; fi + if [ ! -d $DYNAMIC_LIBRARY_DIR ]; then mkdir -p $DYNAMIC_LIBRARY_DIR; fi elif [[ "$TYPE" == "application" || "$TYPE" == "test" ]]; then @@ -39,7 +39,7 @@ elif [[ "$TYPE" == "application" || "$TYPE" == "test" ]]; then # this project's final directory. # first make sure the executable directory is around. - if [ ! -d $EXECUTABLE_DIR ]; then mkdir $EXECUTABLE_DIR; fi + if [ ! -d $EXECUTABLE_DIR ]; then mkdir -p $EXECUTABLE_DIR; fi if [ -z "$NO_COMPILE" ]; then # we ensure that none of the normal products are copied for a non-compiling @@ -61,6 +61,6 @@ elif [ "$TYPE" = "hierarchy" ]; then else echo "Unknown type for project [$TYPE]; cancelling postconditions!" - source $CLAM_DIR/exit_make.sh + source $CLAM_SCRIPTS/exit_make.sh fi