* "ensureDir" -> "mkdir -p". "ensureDir" is a rather pointless

function, so obsolete it.

svn path=/nixpkgs/branches/stdenv-updates/; revision=31644

pkgs/stdenv/adapters.nix

@@ -83,10 +83,10 @@ rec {
           + " --disable-shared"; # brrr...
 
         NIX_GCC = runCommand "klibc-wrapper" {} ''
-          ensureDir $out/bin
+          mkdir -p $out/bin
           ln -s ${klibc}/bin/klcc $out/bin/gcc
           ln -s ${klibc}/bin/klcc $out/bin/cc
-          ensureDir $out/nix-support
+          mkdir -p $out/nix-support
           echo 'PATH=$PATH:${stdenv.gcc.binutils}/bin' > $out/nix-support/setup-hook
         '';
       });
@@ -209,7 +209,7 @@ rec {
 
         moveBuildDir =
           ''
-            ensureDir $out/.build
+            mkdir -p $out/.build
             cd $out/.build
           '';
       } stdenv;

pkgs/stdenv/generic/setup.sh

@@ -39,7 +39,7 @@ exitHandler() {
         # normally.  Otherwise, return the original exit code.
         if test -n "$succeedOnFailure"; then
             echo "build failed with exit code $exitCode (ignored)"
-            ensureDir "$out/nix-support"
+            mkdir -p "$out/nix-support"
             echo -n $exitCode > "$out/nix-support/failed"
             exit 0
         fi
@@ -139,7 +139,7 @@ ensureDir() {
 }
 
 installBin() {
-    ensureDir $out/bin
+    mkdir -p $out/bin
     cp "$@" $out/bin
 }
 
@@ -682,7 +682,7 @@ patchShebangs() {
 installPhase() {
     runHook preInstall
 
-    ensureDir "$prefix"
+    mkdir -p "$prefix"
 
     installTargets=${installTargets:-install}
     echo "install flags: $installTargets $makeFlags ${makeFlagsArray[@]} $installFlags ${installFlagsArray[@]}"
@@ -709,7 +709,7 @@ fixupPhase() {
                     echo "both $d/ and share/$d/ exists!"
                 else
                     echo "fixing location of $d/ subdirectory"
-                    ensureDir $prefix/share
+                    mkdir -p $prefix/share
                     if test -w $prefix/share; then
                         mv -v $prefix/$d $prefix/share
                         ln -sv share/$d $prefix
@@ -755,17 +755,17 @@ fixupPhase() {
     fi
 
     if test -n "$propagatedBuildInputs"; then
-        ensureDir "$out/nix-support"
+        mkdir -p "$out/nix-support"
         echo "$propagatedBuildInputs" > "$out/nix-support/propagated-build-inputs"
     fi
 
     if test -n "$propagatedBuildNativeInputs"; then
-        ensureDir "$out/nix-support"
+        mkdir -p "$out/nix-support"
         echo "$propagatedBuildNativeInputs" > "$out/nix-support/propagated-build-native-inputs"
     fi
 
     if test -n "$setupHook"; then
-        ensureDir "$out/nix-support"
+        mkdir -p "$out/nix-support"
         substituteAll "$setupHook" "$out/nix-support/setup-hook"
     fi
 
@@ -780,7 +780,7 @@ distPhase() {
     make ${makefile:+-f $makefile} $distFlags "${distFlagsArray[@]}" ${distTarget:-dist}
 
     if test "$dontCopyDist" != 1; then
-        ensureDir "$out/tarballs"
+        mkdir -p "$out/tarballs"
 
         # Note: don't quote $tarballs, since we explicitly permit
         # wildcards in there.

pkgs/stdenv/linux/default.nix

@@ -123,7 +123,7 @@ rec {
   bootstrapGlibc = stdenvLinuxBoot0.mkDerivation {
     name = "bootstrap-glibc";
     buildCommand = ''
-      ensureDir $out
+      mkdir -p $out
       ln -s ${bootstrapTools}/lib $out/lib
       ln -s ${bootstrapTools}/include-glibc $out/include
     '';

pkgs/stdenv/linux/make-bootstrap-tools.nix

@@ -92,7 +92,7 @@ rec {
 
       buildCommand = ''
 	set -x
-        ensureDir $out/bin $out/lib $out/libexec
+        mkdir -p $out/bin $out/lib $out/libexec
 
         # Copy what we need of Glibc.
         cp -d ${glibc}/lib/ld*.so* $out/lib

pkgs/stdenv/mingw/setup.sh

@@ -38,7 +38,7 @@ exitHandler() {
         # normally.  Otherwise, return the original exit code.
         if test -n "$succeedOnFailure"; then
             echo "build failed with exit code $exitCode (ignored)"
-            ensureDir "$out/nix-support"
+            mkdir -p "$out/nix-support"
             echo -n $exitCode > "$out/nix-support/failed"
             exit 0
         fi
@@ -133,7 +133,7 @@ ensureDir() {
 }
 
 installBin() {
-    ensureDir $out/bin
+    mkdir -p $out/bin
     cp "$@" $out/bin
 }
 
@@ -611,7 +611,7 @@ patchShebangs() {
 installPhase() {
     runHook preInstall
 
-    ensureDir "$prefix"
+    mkdir -p "$prefix"
 
     installTargets=${installTargets:-install}
     echo "install flags: $installTargets $makeFlags ${makeFlagsArray[@]} $installFlags ${installFlagsArray[@]}"
@@ -638,7 +638,7 @@ fixupPhase() {
                     echo "both $d/ and share/$d/ exists!"
                 else
                     echo "fixing location of $d/ subdirectory"
-                    ensureDir $prefix/share
+                    mkdir -p $prefix/share
                     if test -w $prefix/share; then
                         mv -v $prefix/$d $prefix/share
                         ln -sv $prefix/share/$d $prefix/$d
@@ -670,12 +670,12 @@ fixupPhase() {
     fi
 
     if test -n "$propagatedBuildInputs"; then
-        ensureDir "$out/nix-support"
+        mkdir -p "$out/nix-support"
         echo "$propagatedBuildInputs" > "$out/nix-support/propagated-build-inputs"
     fi
 
     if test -n "$setupHook"; then
-        ensureDir "$out/nix-support"
+        mkdir -p "$out/nix-support"
         substituteAll "$setupHook" "$out/nix-support/setup-hook"
     fi
 
@@ -690,7 +690,7 @@ distPhase() {
     make ${makefile:+-f $makefile} $distFlags "${distFlagsArray[@]}" ${distTarget:-dist}
 
     if test "$dontCopyDist" != 1; then
-        ensureDir "$out/tarballs"
+        mkdir -p "$out/tarballs"
 
         # Note: don't quote $tarballs, since we explicitly permit
         # wildcards in there.