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

  function, so obsolete it.

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

25 files changed, 33 insertions, 33 deletions

diff --git a/pkgs/development/tools/analysis/checkstyle/default.nix b/pkgs/development/tools/analysis/checkstyle/default.nix
index 17fc8de8c95c..09656dc520a8 100644
--- a/pkgs/development/tools/analysis/checkstyle/default.nix
+++ b/pkgs/development/tools/analysis/checkstyle/default.nix
@@ -10,7 +10,7 @@ stdenv.mkDerivation {
   };
 
   installPhase = ''
-    ensureDir $out/checkstyle
+    mkdir -p $out/checkstyle
     cp -R * $out/checkstyle
   '';
 
diff --git a/pkgs/development/tools/analysis/emma/default.nix b/pkgs/development/tools/analysis/emma/default.nix
index 97e061d6b3f5..8275beff88d0 100644
--- a/pkgs/development/tools/analysis/emma/default.nix
+++ b/pkgs/development/tools/analysis/emma/default.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation {
   buildInputs = [unzip];
 
   installPhase = ''
-    ensureDir $out/lib/jars
+    mkdir -p $out/lib/jars
     cp lib/*.jar $out/lib/jars/
   '';
 
diff --git a/pkgs/development/tools/analysis/findbugs/default.nix b/pkgs/development/tools/analysis/findbugs/default.nix
index cf4f87f528e1..0623632936d7 100644
--- a/pkgs/development/tools/analysis/findbugs/default.nix
+++ b/pkgs/development/tools/analysis/findbugs/default.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation {
   '';
 
   installPhase = ''
-    ensureDir $out
+    mkdir -p $out
     cp -prd bin lib plugin doc $out/
     rm $out/bin/*.bat
   '';
diff --git a/pkgs/development/tools/analysis/jdepend/default.nix b/pkgs/development/tools/analysis/jdepend/default.nix
index 6973fbad9e7c..7498d3b652ac 100644
--- a/pkgs/development/tools/analysis/jdepend/default.nix
+++ b/pkgs/development/tools/analysis/jdepend/default.nix
@@ -10,7 +10,7 @@ stdenv.mkDerivation {
   };
 
   installPhase = ''
-    ensureDir $out
+    mkdir -p $out
     cp -R * $out
   '';
 
diff --git a/pkgs/development/tools/analysis/pmd/default.nix b/pkgs/development/tools/analysis/pmd/default.nix
index 7f50431c8d9a..b830ee008389 100644
--- a/pkgs/development/tools/analysis/pmd/default.nix
+++ b/pkgs/development/tools/analysis/pmd/default.nix
@@ -10,7 +10,7 @@ stdenv.mkDerivation {
   };
 
   installPhase = ''
-    ensureDir $out
+    mkdir -p $out
     cp -R * $out
   '';
 
diff --git a/pkgs/development/tools/analysis/spin/default.nix b/pkgs/development/tools/analysis/spin/default.nix
index cedd9584414f..b4fdd4c09d4d 100644
--- a/pkgs/development/tools/analysis/spin/default.nix
+++ b/pkgs/development/tools/analysis/spin/default.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation {
     sed -i -e 's/-DNXT/-DNXT -DCPP="\\"gcc -E -x c\\""/' makefile
   '';
   installPhase = ''
-    ensureDir $out/bin
+    mkdir -p $out/bin
     cp ../Xspin*/xsp* $out/bin/xspin
     sed -i -e '1s@^#!/bin/sh@#!${tk}/bin/wish@' \
       -e '/exec wish/d' $out/bin/xspin
diff --git a/pkgs/development/tools/build-managers/apache-ant/from-source.nix b/pkgs/development/tools/build-managers/apache-ant/from-source.nix
index a5a19a671436..ef6763a0fa28 100644
--- a/pkgs/development/tools/build-managers/apache-ant/from-source.nix
+++ b/pkgs/development/tools/build-managers/apache-ant/from-source.nix
@@ -39,7 +39,7 @@ EOF
 
   # Note: We don't build the javadoc.
   buildPhase = ''
-    ensureDir "$out"
+    mkdir -p "$out"
     ./build.sh -Dant.install="$out" install-lite
   '';
 
@@ -48,7 +48,7 @@ EOF
     # rearrange a few things.
     rm -v "$out/bin/"*.bat
 
-    ensureDir "$out/lib/java"
+    mkdir -p "$out/lib/java"
     mv -v "$out/lib/"*.jar "$out/lib/java"
     sed -i "$out/bin/ant" \
         -e "s|^ANT_LIB=.*$|ANT_LIB=$out/lib/java|g ;
diff --git a/pkgs/development/tools/build-managers/bam/default.nix b/pkgs/development/tools/build-managers/bam/default.nix
index ef5aed1f26ed..e7e4b6d09092 100644
--- a/pkgs/development/tools/build-managers/bam/default.nix
+++ b/pkgs/development/tools/build-managers/bam/default.nix
@@ -38,9 +38,9 @@ rec {
   '' ["build" "addInputs"];
 
   doDeploy = a.fullDepEntry ''
-    ensureDir "$out/share/bam"
+    mkdir -p "$out/share/bam"
     cp -r docs examples tests  "$out/share/bam"
-    ensureDir "$out/bin"
+    mkdir -p "$out/bin"
     cp bam "$out/bin"
   '' ["minInit" "defEnsureDir" "build"];
       
diff --git a/pkgs/development/tools/build-managers/buildbot/default.nix b/pkgs/development/tools/build-managers/buildbot/default.nix
index 92b63869f33b..71862ec1cf75 100644
--- a/pkgs/development/tools/build-managers/buildbot/default.nix
+++ b/pkgs/development/tools/build-managers/buildbot/default.nix
@@ -26,7 +26,7 @@ buildPythonPackage (rec {
   doCheck = false;
 
   postInstall =
-    '' ensureDir "$out/share/info"
+    '' mkdir -p "$out/share/info"
        make -C docs buildbot.info
        cp -v "docs/buildbot.info"* "$out/share/info"
     '';
diff --git a/pkgs/development/tools/build-managers/gradle/default.nix b/pkgs/development/tools/build-managers/gradle/default.nix
index 9fc25aad64d2..576d8e357f4b 100644
--- a/pkgs/development/tools/build-managers/gradle/default.nix
+++ b/pkgs/development/tools/build-managers/gradle/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/tools/build-managers/jam/default.nix b/pkgs/development/tools/build-managers/jam/default.nix
index d2a002a70cf7..6324fa92cbd9 100644
--- a/pkgs/development/tools/build-managers/jam/default.nix
+++ b/pkgs/development/tools/build-managers/jam/default.nix
@@ -8,7 +8,7 @@ stdenv.mkDerivation {
   };
 
   installPhase = ''
-    ensureDir $out/bin
+    mkdir -p $out/bin
     cp bin.linux/jam $out/bin
   '';
 
diff --git a/pkgs/development/tools/misc/cbrowser/default.nix b/pkgs/development/tools/misc/cbrowser/default.nix
index 50dc907a7804..bf927db2793c 100644
--- a/pkgs/development/tools/misc/cbrowser/default.nix
+++ b/pkgs/development/tools/misc/cbrowser/default.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   buildInputs = [ tk makeWrapper ];
 
   installPhase = ''
-    ensureDir $out/bin $out/share/${name}
+    mkdir -p $out/bin $out/share/${name}
     cp -R * $out/share/${name}/
 
     makeWrapper $out/share/${name}/cbrowser $out/bin/cbrowser \
diff --git a/pkgs/development/tools/misc/cscope/default.nix b/pkgs/development/tools/misc/cscope/default.nix
index c27c7ab291a2..3cba5cd2e76a 100644
--- a/pkgs/development/tools/misc/cscope/default.nix
+++ b/pkgs/development/tools/misc/cscope/default.nix
@@ -24,10 +24,10 @@ stdenv.mkDerivation rec {
     # Install Emacs mode.
     cd "contrib/xcscope"
 
-    ensureDir "$out/libexec/cscope"
+    mkdir -p "$out/libexec/cscope"
     cp "cscope-indexer" "$out/libexec/cscope"
 
-    ensureDir "$out/share/emacs/site-lisp"
+    mkdir -p "$out/share/emacs/site-lisp"
     emacs --batch --eval '(byte-compile-file "xcscope.el")'
     cp xcscope.el{,c} "$out/share/emacs/site-lisp"
   '';
diff --git a/pkgs/development/tools/misc/global/default.nix b/pkgs/development/tools/misc/global/default.nix
index fef5a71201ab..6e6464a590be 100644
--- a/pkgs/development/tools/misc/global/default.nix
+++ b/pkgs/development/tools/misc/global/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   doCheck = true;
 
   postInstall = ''
-    ensureDir "$out/share/emacs/site-lisp"
+    mkdir -p "$out/share/emacs/site-lisp"
     cp -v *.el "$out/share/emacs/site-lisp"
   '';
 
diff --git a/pkgs/development/tools/misc/lsof/default.nix b/pkgs/development/tools/misc/lsof/default.nix
index f679577a3f1a..69503782d6ef 100644
--- a/pkgs/development/tools/misc/lsof/default.nix
+++ b/pkgs/development/tools/misc/lsof/default.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation {
   configurePhase = "./Configure -n linux;";
   
   installPhase = ''
-    ensureDir $out/bin $out/man/man8
+    mkdir -p $out/bin $out/man/man8
     cp lsof.8 $out/man/man8/
     cp lsof $out/bin
   '';
diff --git a/pkgs/development/tools/misc/ninka/default.nix b/pkgs/development/tools/misc/ninka/default.nix
index dddb577edbf3..1cb491df8d1e 100644
--- a/pkgs/development/tools/misc/ninka/default.nix
+++ b/pkgs/development/tools/misc/ninka/default.nix
@@ -25,12 +25,12 @@ stdenv.mkDerivation {
   
   installPhase = ''
     cd ../..
-    ensureDir $out/bin
+    mkdir -p $out/bin
     cp ninka.pl $out/bin
     cp -av {extComments,splitter,filter,senttok,matcher} $out/bin
     
     cd comments/comments    
-    ensureDir $out/{bin,share/man/man1}
+    mkdir -p $out/{bin,share/man/man1}
     make install    
   '';
   
diff --git a/pkgs/development/tools/misc/sloccount/default.nix b/pkgs/development/tools/misc/sloccount/default.nix
index 906770e90665..e7adb30d3166 100644
--- a/pkgs/development/tools/misc/sloccount/default.nix
+++ b/pkgs/development/tools/misc/sloccount/default.nix
@@ -37,9 +37,9 @@ stdenv.mkDerivation rec {
   checkPhase = ''HOME="$TMPDIR" PATH="$PWD:$PATH" make test'';
 
   preInstall = ''
-    ensureDir "$out/bin"
-    ensureDir "$out/share/man/man1"
-    ensureDir "$out/share/doc"
+    mkdir -p "$out/bin"
+    mkdir -p "$out/share/man/man1"
+    mkdir -p "$out/share/doc"
   '';
 
   meta = {
diff --git a/pkgs/development/tools/misc/unifdef/default.nix b/pkgs/development/tools/misc/unifdef/default.nix
index 30afee4586b0..f4b38f4f7abc 100644
--- a/pkgs/development/tools/misc/unifdef/default.nix
+++ b/pkgs/development/tools/misc/unifdef/default.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation {
   '';
 
   installPhase = ''
-    ensureDir $out/bin
+    mkdir -p $out/bin
     cp unifdef $out/bin
   '';
 
diff --git a/pkgs/development/tools/misc/usb-modeswitch/default.nix b/pkgs/development/tools/misc/usb-modeswitch/default.nix
index a883024690ae..48a823c3c656 100644
--- a/pkgs/development/tools/misc/usb-modeswitch/default.nix
+++ b/pkgs/development/tools/misc/usb-modeswitch/default.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation {
   preConfigure = ''
     find -type f | xargs sed 's@/bin/rm@rm@g' -i
     make clean
-    ensureDir $out/{etc,lib/udev,share/man/man1}
+    mkdir -p $out/{etc,lib/udev,share/man/man1}
     makeFlags="DESTDIR=$out PREFIX=$out"
   '';
 
diff --git a/pkgs/development/tools/ocaml/camlidl/default.nix b/pkgs/development/tools/ocaml/camlidl/default.nix
index 8f77c0c6fc0d..d049377ea949 100644
--- a/pkgs/development/tools/ocaml/camlidl/default.nix
+++ b/pkgs/development/tools/ocaml/camlidl/default.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation {
     mv config/Makefile.unix config/Makefile
     substituteInPlace config/Makefile --replace BINDIR=/usr/local/bin BINDIR=$out
     substituteInPlace config/Makefile --replace OCAMLLIB=/usr/local/lib/ocaml OCAMLLIB=$out/lib/ocaml/${ocaml_version}/site-lib/camlidl
-    ensureDir $out/lib/ocaml/${ocaml_version}/site-lib/camlidl/caml
+    mkdir -p $out/lib/ocaml/${ocaml_version}/site-lib/camlidl/caml
   '';
 
   meta = {
diff --git a/pkgs/development/tools/ocaml/findlib/default.nix b/pkgs/development/tools/ocaml/findlib/default.nix
index 70fb45a19795..c89af03097d7 100644
--- a/pkgs/development/tools/ocaml/findlib/default.nix
+++ b/pkgs/development/tools/ocaml/findlib/default.nix
@@ -40,7 +40,7 @@ stdenv.mkDerivation {
         fi
         export OCAMLFIND_DESTDIR="''$out/lib/ocaml/${ocaml_version}/site-lib/"
         if test -n "$createFindlibDestdir"; then
-          ensureDir $OCAMLFIND_DESTDIR
+          mkdir -p $OCAMLFIND_DESTDIR
         fi
     }
     
diff --git a/pkgs/development/tools/parsing/antlr/builder.sh b/pkgs/development/tools/parsing/antlr/builder.sh
index 1d9f352c5698..b8e7791b6fc9 100644
--- a/pkgs/development/tools/parsing/antlr/builder.sh
+++ b/pkgs/development/tools/parsing/antlr/builder.sh
@@ -4,8 +4,8 @@ tar zxvf $src
 cd antlr-*
 cd lib
 
-ensureDir $out/lib/antlr
-ensureDir $out/bin
+mkdir -p $out/lib/antlr
+mkdir -p $out/bin
 
 cp *.jar $out/lib/antlr
 
diff --git a/pkgs/development/tools/parsing/frown/builder.sh b/pkgs/development/tools/parsing/frown/builder.sh
index 82689b42d72d..075d2bc758c5 100644
--- a/pkgs/development/tools/parsing/frown/builder.sh
+++ b/pkgs/development/tools/parsing/frown/builder.sh
@@ -2,6 +2,6 @@ source $stdenv/setup
 
 makeFlags="-e PREFIX=\"$out\""
 
-ensureDir $out/bin
+mkdir -p $out/bin
 
 genericBuild
diff --git a/pkgs/development/tools/parsing/jikespg/builder.sh b/pkgs/development/tools/parsing/jikespg/builder.sh
index 090def7c4643..e63ec9808f23 100644
--- a/pkgs/development/tools/parsing/jikespg/builder.sh
+++ b/pkgs/development/tools/parsing/jikespg/builder.sh
@@ -8,7 +8,7 @@ configurePhase() {
 }
 
 installPhase() {
-  ensureDir $out/bin
+  mkdir -p $out/bin
   cp jikespg $out/bin
 }
 
diff --git a/pkgs/development/tools/selenium/remote-control/default.nix b/pkgs/development/tools/selenium/remote-control/default.nix
index 0a7a12a6e171..fbe11ed2bc04 100644
--- a/pkgs/development/tools/selenium/remote-control/default.nix
+++ b/pkgs/development/tools/selenium/remote-control/default.nix
@@ -16,7 +16,7 @@ in stdenv.mkDerivation {
     buildInputs = [unzip];
     phases = "unpackPhase buildPhase";
     buildPhase = ''
-      ensureDir $out/{bin,lib}
+      mkdir -p $out/{bin,lib}
       mv * $out/lib
       bin="$out/bin/selenium-remote-control"
       cat >> "$bin" << EOF
@@ -37,7 +37,7 @@ in stdenv.mkDerivation {
     };
     phases = "buildPhase";
     buildPhase = ''
-      ensureDir $out/{bin,lib}
+      mkdir -p $out/{bin,lib}
       cp $src $out/lib/
       bin="$out/bin/selenium-remote-control"
       cat >> "$bin" << EOF