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

  function, so obsolete it.

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

17 files changed, 21 insertions, 21 deletions

diff --git a/pkgs/development/interpreters/acl2/default.nix b/pkgs/development/interpreters/acl2/default.nix
index 6cad083ac853..6d074ac9f279 100644
--- a/pkgs/development/interpreters/acl2/default.nix
+++ b/pkgs/development/interpreters/acl2/default.nix
@@ -28,7 +28,7 @@ rec {
     cd $out/share/${installSuffix}
     make LISP=${a.sbcl}/bin/sbcl
     make LISP=${a.sbcl}/bin/sbcl regression
-    ensureDir "$out/bin"
+    mkdir -p "$out/bin"
     cp saved_acl2 "$out/bin/acl2"
   '') ["doDeploy" "addInputs" "defEnsureDir"];
       
diff --git a/pkgs/development/interpreters/angelscript/default.nix b/pkgs/development/interpreters/angelscript/default.nix
index 65ff72bae56f..24edb2ec4df5 100644
--- a/pkgs/development/interpreters/angelscript/default.nix
+++ b/pkgs/development/interpreters/angelscript/default.nix
@@ -32,7 +32,7 @@ rec {
   prepareBuild = a.fullDepEntry ''
     cd angelscript/projects/gnuc
     sed -i makefile -e "s@LOCAL = .*@LOCAL = $out@"
-    ensureDir "$out/lib" "$out/bin" "$out/share" "$out/include"
+    mkdir -p "$out/lib" "$out/bin" "$out/share" "$out/include"
     export SHARED=1 
     export VERSION="${version}"
   '' ["minInit" "addInputs" "doUnpack" "defEnsureDir"];
@@ -42,7 +42,7 @@ rec {
   '' ["minInit"];
 
   installDocs = a.fullDepEntry ''
-    ensureDir "$out/share/angelscript"
+    mkdir -p "$out/share/angelscript"
     cp -r ../../../docs  "$out/share/angelscript"
   '' ["defEnsureDir" "prepareBuild"];
       
diff --git a/pkgs/development/interpreters/clojure/binary.nix b/pkgs/development/interpreters/clojure/binary.nix
index 7b53ea9022d6..8cf350e7e972 100644
--- a/pkgs/development/interpreters/clojure/binary.nix
+++ b/pkgs/development/interpreters/clojure/binary.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation {
   phases = "unpackPhase installPhase";
 
   installPhase = "
-    ensureDir $out/lib/java
+    mkdir -p $out/lib/java
     install -t $out/lib/java clojure.jar
   ";
 
diff --git a/pkgs/development/interpreters/clojure/clooj.nix b/pkgs/development/interpreters/clojure/clooj.nix
index 23bf9ad03b78..2ad6f751f2bd 100644
--- a/pkgs/development/interpreters/clojure/clooj.nix
+++ b/pkgs/development/interpreters/clojure/clooj.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation {
   phases = "installPhase";
 
   installPhase = ''
-    ensureDir $out/lib/java
+    mkdir -p $out/lib/java
     ln -s ${jar} $out/lib/java/clooj.jar
   '';
 
diff --git a/pkgs/development/interpreters/clojure/default.nix b/pkgs/development/interpreters/clojure/default.nix
index f829beda7bab..f68b89f03980 100644
--- a/pkgs/development/interpreters/clojure/default.nix
+++ b/pkgs/development/interpreters/clojure/default.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation {
   buildPhase = "ant";
 
   installPhase = "
-    ensureDir $out/lib/java
+    mkdir -p $out/lib/java
     install -t $out/lib/java clojure.jar
   ";
 
diff --git a/pkgs/development/interpreters/groovy/default.nix b/pkgs/development/interpreters/groovy/default.nix
index cc994aeea34b..593cc61dc410 100644
--- a/pkgs/development/interpreters/groovy/default.nix
+++ b/pkgs/development/interpreters/groovy/default.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   };
 
   installPhase = ''
-    ensureDir $out
+    mkdir -p $out
     rm bin/*.bat
     mv * $out
   '';
diff --git a/pkgs/development/interpreters/j/default.nix b/pkgs/development/interpreters/j/default.nix
index 3be0e8aa1174..d4a1ab85b139 100644
--- a/pkgs/development/interpreters/j/default.nix
+++ b/pkgs/development/interpreters/j/default.nix
@@ -53,11 +53,11 @@ rec {
   '' ["doUnpack" "addInputs" "minInit"];
 
   doDeploy = a.fullDepEntry ''
-    ensureDir "$out"
+    mkdir -p "$out"
     cp -r j/bin "$out/bin"
     rm "$out/bin/profilex_template.ijs"
     
-    ensureDir "$out/share/j"
+    mkdir -p "$out/share/j"
 
     cp -r docs j/addons j/system "$out/share/j"
   '' ["doUnpack" "doBuildJ" "minInit" "defEnsureDir"];
diff --git a/pkgs/development/interpreters/jruby/default.nix b/pkgs/development/interpreters/jruby/default.nix
index d26ab6949344..1e402e14e7da 100644
--- a/pkgs/development/interpreters/jruby/default.nix
+++ b/pkgs/development/interpreters/jruby/default.nix
@@ -8,7 +8,7 @@ stdenv.mkDerivation {
     sha256 = "1q3cjshxk484i8gqxm682bxcrps7205nl9vlim4s6z827bjlmc4a";
   };
 
-  installPhase = '' ensureDir $out; cp -r * $out '';
+  installPhase = '' mkdir -p $out; cp -r * $out '';
 
   meta = { 
     description = "Ruby interpreter written in Java";
diff --git a/pkgs/development/interpreters/kona/default.nix b/pkgs/development/interpreters/kona/default.nix
index 2e433e11033f..7e4f1e408b44 100644
--- a/pkgs/development/interpreters/kona/default.nix
+++ b/pkgs/development/interpreters/kona/default.nix
@@ -29,7 +29,7 @@ rec {
   makeFlags = ["PREFIX=\$out"];
 
   prepareOut = a.fullDepEntry ''
-    ensureDir "$out/bin"
+    mkdir -p "$out/bin"
   '' ["minInit" "defEnsureDir"];
       
   meta = {
diff --git a/pkgs/development/interpreters/lua-5/default.nix b/pkgs/development/interpreters/lua-5/default.nix
index 06703e12210d..c11a9d10d7b3 100644
--- a/pkgs/development/interpreters/lua-5/default.nix
+++ b/pkgs/development/interpreters/lua-5/default.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation {
   postInstall = ''
     sed -i -e "s@/usr/local@$out@" etc/lua.pc
     sed -i -e "s@-llua -lm@-llua -lm -ldl@" etc/lua.pc
-    ensureDir "$out/lib/pkgconfig"
+    mkdir -p "$out/lib/pkgconfig"
     install -m 644 etc/lua.pc $out/lib/pkgconfig/lua.pc
   '';
   buildInputs = [ ncurses readline ];
diff --git a/pkgs/development/interpreters/maude/default.nix b/pkgs/development/interpreters/maude/default.nix
index f5d4fd090159..de1a14b522b2 100644
--- a/pkgs/development/interpreters/maude/default.nix
+++ b/pkgs/development/interpreters/maude/default.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
   postInstall =
   ''
     for n in "$out/bin/"*; do wrapProgram "$n" --suffix MAUDE_LIB ':' "$out/share/maude"; done
-    ensureDir $out/share/maude
+    mkdir -p $out/share/maude
     cp ${fullMaude} $out/share/maude/full-maude.maude
   '';
 
diff --git a/pkgs/development/interpreters/perl/5.8/default.nix b/pkgs/development/interpreters/perl/5.8/default.nix
index 4b965999910c..c421e2768cdc 100644
--- a/pkgs/development/interpreters/perl/5.8/default.nix
+++ b/pkgs/development/interpreters/perl/5.8/default.nix
@@ -25,7 +25,7 @@ preBuild() {
 }
 
 postInstall() {
-    ensureDir "$out/nix-support"
+    mkdir -p "$out/nix-support"
     cp $setupHook $out/nix-support/setup-hook
 }
 
diff --git a/pkgs/development/interpreters/php-xdebug/default.nix b/pkgs/development/interpreters/php-xdebug/default.nix
index 74aba643ee7d..5a242f3c85a4 100644
--- a/pkgs/development/interpreters/php-xdebug/default.nix
+++ b/pkgs/development/interpreters/php-xdebug/default.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation {
   '';
 
   installPhase = ''
-    ensureDir $out/lib/xdebug
+    mkdir -p $out/lib/xdebug
     cp modules/xdebug.so $out/lib
     cp LICENSE $out/lib/xdebug
   '';
diff --git a/pkgs/development/interpreters/picolisp/default.nix b/pkgs/development/interpreters/picolisp/default.nix
index 298c12d271a4..196e7068e146 100644
--- a/pkgs/development/interpreters/picolisp/default.nix
+++ b/pkgs/development/interpreters/picolisp/default.nix
@@ -41,7 +41,7 @@ rec {
 
     sed -e "s@/usr/@$out/@g" -i bin/pil
 
-    ensureDir "$out/share/picolisp" "$out/lib" "$out/bin"
+    mkdir -p "$out/share/picolisp" "$out/lib" "$out/bin"
     cp -r . "$out/share/picolisp/build-dir"
     ln -s "$out/share/picolisp/build-dir" "$out/lib/picolisp"
     ln -s "$out/lib/picolisp/bin/picolisp" "$out/bin/picolisp"
diff --git a/pkgs/development/interpreters/python/pythonhome-wrapper.nix b/pkgs/development/interpreters/python/pythonhome-wrapper.nix
index 2afbafe7b914..c9cf6277b244 100644
--- a/pkgs/development/interpreters/python/pythonhome-wrapper.nix
+++ b/pkgs/development/interpreters/python/pythonhome-wrapper.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation {
 
   unpackPhase = "true";
   installPhase = ''
-    ensureDir $out/bin
+    mkdir -p $out/bin
     echo '
 #!/bin/sh
 
diff --git a/pkgs/development/interpreters/python/wrapper.nix b/pkgs/development/interpreters/python/wrapper.nix
index 6f29f79e2c16..727b9cbc6767 100644
--- a/pkgs/development/interpreters/python/wrapper.nix
+++ b/pkgs/development/interpreters/python/wrapper.nix
@@ -7,7 +7,7 @@ stdenv.mkDerivation {
 
   unpackPhase = "true";
   installPhase = ''
-    ensureDir "$out/bin"
+    mkdir -p "$out/bin"
     for prg in 2to3 idle pydoc python python-config python${python.majorVersion} python${python.majorVersion}-config smtpd.py; do
       makeWrapper "$python/bin/$prg" "$out/bin/$prg" --suffix PYTHONPATH : "$PYTHONPATH"
     done
diff --git a/pkgs/development/interpreters/spidermonkey/builder.sh b/pkgs/development/interpreters/spidermonkey/builder.sh
index b0cfe6c9ed62..91110159665c 100644
--- a/pkgs/development/interpreters/spidermonkey/builder.sh
+++ b/pkgs/development/interpreters/spidermonkey/builder.sh
@@ -22,9 +22,9 @@ $MAKE printlibraries
 $MAKE printprograms
 $MAKE
 
-ensureDir $out
-ensureDir $out/bin
-ensureDir $out/lib
+mkdir -p $out
+mkdir -p $out/bin
+mkdir -p $out/lib
 
 # Install the binaries that have been created.
 install $(cat PROGRAMS) $out/bin