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

  function, so obsolete it.

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

18 files changed, 33 insertions, 33 deletions

diff --git a/pkgs/applications/editors/eclipse/default.nix b/pkgs/applications/editors/eclipse/default.nix
index bc53dfc70f32..801efc166daa 100644
--- a/pkgs/applications/editors/eclipse/default.nix
+++ b/pkgs/applications/editors/eclipse/default.nix
@@ -27,7 +27,7 @@ let
 
       buildCommand = ''
         # Unpack tarball.
-        ensureDir $out
+        mkdir -p $out
         tar xfvz $src -C $out
 
         # Patch binaries.
@@ -47,7 +47,7 @@ let
           --add-flags "-configuration \$HOME/.eclipse/''${productId}_$productVersion/configuration"
 
         # Create desktop item.
-        ensureDir $out/share/applications
+        mkdir -p $out/share/applications
         cp ${desktopItem}/share/applications/* $out/share/applications
       ''; # */
 
diff --git a/pkgs/applications/editors/elvis/default.nix b/pkgs/applications/editors/elvis/default.nix
index 511e284ed39e..e1d2ad69b1dd 100644
--- a/pkgs/applications/editors/elvis/default.nix
+++ b/pkgs/applications/editors/elvis/default.nix
@@ -15,16 +15,16 @@ stdenv.mkDerivation rec {
   '';
 
   preConfigure = ''
-    ensureDir $out/share/man/man1
+    mkdir -p $out/share/man/man1
   '';
 
   installPhase = ''
-    ensureDir $out/bin $out/share/elvis $out/share/elvis/doc
+    mkdir -p $out/bin $out/share/elvis $out/share/elvis/doc
     cp elvis ref elvtags elvfmt $out/bin
     cp -R data/* $out/share/elvis
     cp doc/* $out/share/elvis/doc
 
-    ensureDir $out/share/man/man1
+    mkdir -p $out/share/man/man1
     for a in doc/*.man; do
       cp $a $out/share/man/man1/`basename $a .man`.1
     done
diff --git a/pkgs/applications/editors/emacs-modes/bbdb/default.nix b/pkgs/applications/editors/emacs-modes/bbdb/default.nix
index 52afebc6297b..ec7a3e8e6002 100644
--- a/pkgs/applications/editors/emacs-modes/bbdb/default.nix
+++ b/pkgs/applications/editors/emacs-modes/bbdb/default.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation {
 
   buildInputs = [emacs texinfo ctags];
   configureFlags = "--with-package-dir=$$out/share/emacs/site-lisp";
-  preInstall = "ensureDir $out/info";
+  preInstall = "mkdir -p $out/info";
   installTargets = "install-pkg texinfo";
   postInstall = ''
     mv  $out/info $out/share/
diff --git a/pkgs/applications/editors/emacs-modes/cedet/default.nix b/pkgs/applications/editors/emacs-modes/cedet/default.nix
index 6a91ac496517..46381dfc648d 100644
--- a/pkgs/applications/editors/emacs-modes/cedet/default.nix
+++ b/pkgs/applications/editors/emacs-modes/cedet/default.nix
@@ -14,11 +14,11 @@ stdenv.mkDerivation rec {
   checkPhase = "make utest";
 
   installPhase = ''
-    ensureDir "$out/share/emacs/site-lisp"
+    mkdir -p "$out/share/emacs/site-lisp"
     cp -v */*.el */*/*.el */*.elc */*/*.elc "$out/share/emacs/site-lisp"
     chmod a-x "$out/share/emacs/site-lisp/"*
 
-    ensureDir "$out/share/info"
+    mkdir -p "$out/share/info"
     cp -v */*.info* */*/*.info* "$out/share/info"
   '';
 
diff --git a/pkgs/applications/editors/emacs-modes/ecb/default.nix b/pkgs/applications/editors/emacs-modes/ecb/default.nix
index 258c13b8eb70..f94d594519ce 100644
--- a/pkgs/applications/editors/emacs-modes/ecb/default.nix
+++ b/pkgs/applications/editors/emacs-modes/ecb/default.nix
@@ -21,10 +21,10 @@ stdenv.mkDerivation rec {
   '';
 
   installPhase = ''
-    ensureDir "$out/share/emacs/site-lisp"
+    mkdir -p "$out/share/emacs/site-lisp"
     cp -rv *.el *.elc ecb-images "$out/share/emacs/site-lisp"
 
-    ensureDir "$out/share/info"
+    mkdir -p "$out/share/info"
     cp -v info-help/*.info* "$out/share/info"
   '';
 
diff --git a/pkgs/applications/editors/emacs-modes/emms/default.nix b/pkgs/applications/editors/emacs-modes/emms/default.nix
index 3a9770314366..5439ba9e4d6e 100644
--- a/pkgs/applications/editors/emacs-modes/emms/default.nix
+++ b/pkgs/applications/editors/emacs-modes/emms/default.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
                           s|/usr/include/taglib|${taglib}/include/taglib|g ;
                           s|/usr/lib|${taglib}/lib|g ;
                           s|^all:\(.*\)\$|all:\1 emms-print-metadata|g"
-    ensureDir "$out/share/man/man1"
+    mkdir -p "$out/share/man/man1"
 
     sed -i "emms-player-mpg321-remote.el" \
         -e 's|emms-player-mpg321-remote-command[[:blank:]]\+"mpg321"|emms-player-mpg321-remote-command "${mpg321}/bin/mpg321"|g'
@@ -45,7 +45,7 @@ stdenv.mkDerivation rec {
   '';
 
   postInstall = ''
-    ensureDir "$out/bin" && cp emms-print-metadata "$out/bin"
+    mkdir -p "$out/bin" && cp emms-print-metadata "$out/bin"
   '';
 
   meta = {
diff --git a/pkgs/applications/editors/emacs-modes/haskell/default.nix b/pkgs/applications/editors/emacs-modes/haskell/default.nix
index 5813fde815f8..b73d91b611c8 100644
--- a/pkgs/applications/editors/emacs-modes/haskell/default.nix
+++ b/pkgs/applications/editors/emacs-modes/haskell/default.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   buildInputs = [emacs];
 
   installPhase = ''
-    ensureDir "$out/share/emacs/site-lisp"
+    mkdir -p "$out/share/emacs/site-lisp"
     cp *.el *.elc *.hs "$out/share/emacs/site-lisp/"
   '';
 
diff --git a/pkgs/applications/editors/emacs-modes/hol_light/default.nix b/pkgs/applications/editors/emacs-modes/hol_light/default.nix
index 9dba1d599fff..24eba20be6cc 100644
--- a/pkgs/applications/editors/emacs-modes/hol_light/default.nix
+++ b/pkgs/applications/editors/emacs-modes/hol_light/default.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation {
 
   installPhase = ''
     DEST=$out/share/emacs/site-lisp
-    ensureDir $DEST
+    mkdir -p $DEST
     cp -a * $DEST
   '';
 
diff --git a/pkgs/applications/editors/emacs-modes/jdee/default.nix b/pkgs/applications/editors/emacs-modes/jdee/default.nix
index 2d93e782048a..02f60d0d698d 100644
--- a/pkgs/applications/editors/emacs-modes/jdee/default.nix
+++ b/pkgs/applications/editors/emacs-modes/jdee/default.nix
@@ -23,7 +23,7 @@ in
     ];
 
     configurePhase = ''
-      ensureDir "dist"
+      mkdir -p "dist"
       cat > build.properties <<EOF
         dist.lisp.dir = dist/share/emacs/site-lisp
         dist.java.lib.dir = dist/lib/java
@@ -50,7 +50,7 @@ in
     installPhase = ''
       ant install
 
-      ensureDir "$out/share/${name}"
+      mkdir -p "$out/share/${name}"
       cp -rv java/bsh-commands "$out/share/${name}"
 
       # Move everything that's not a JAR to $datadir.  This includes
diff --git a/pkgs/applications/editors/emacs-modes/org/default.nix b/pkgs/applications/editors/emacs-modes/org/default.nix
index 18ea2797bec5..f0a519879370 100644
--- a/pkgs/applications/editors/emacs-modes/org/default.nix
+++ b/pkgs/applications/editors/emacs-modes/org/default.nix
@@ -29,10 +29,10 @@ stdenv.mkDerivation rec {
   installPhase =
     '' make install install-info
 
-       ensureDir "$out/share/doc/${name}"
+       mkdir -p "$out/share/doc/${name}"
        cp -v doc/org*.{html,pdf,txt} "$out/share/doc/${name}"
 
-       ensureDir "$out/share/org"
+       mkdir -p "$out/share/org"
        cp -R contrib "$out/share/org/contrib"
     '';
 
diff --git a/pkgs/applications/editors/emacs-modes/quack/default.nix b/pkgs/applications/editors/emacs-modes/quack/default.nix
index 317f121f3648..86371890db15 100644
--- a/pkgs/applications/editors/emacs-modes/quack/default.nix
+++ b/pkgs/applications/editors/emacs-modes/quack/default.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation {
   buildPhase = ''
     emacsDir="$out/share/emacs/site-lisp"
 
-    ensureDir "$emacsDir"
+    mkdir -p "$emacsDir"
     cp -v "$src" "$emacsDir/quack.el"
     emacs --batch -f batch-byte-compile "$emacsDir/quack.el"
   '';
diff --git a/pkgs/applications/editors/emacs-modes/rudel/default.nix b/pkgs/applications/editors/emacs-modes/rudel/default.nix
index 9bb7870fb5a1..787f5df6eb04 100644
--- a/pkgs/applications/editors/emacs-modes/rudel/default.nix
+++ b/pkgs/applications/editors/emacs-modes/rudel/default.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation
 
   installPhase = ''
     for n in . obby zeroconf jupiter; do
-      ensureDir "$out/share/emacs/site-lisp/$n";
+      mkdir -p "$out/share/emacs/site-lisp/$n";
       cp $n/*.el "$out/share/emacs/site-lisp/$n/";
     done
     install -D -m444 doc/card.pdf "$out/share/doc/rudel/card.pdf"
diff --git a/pkgs/applications/editors/emacs-modes/scala-mode/default.nix b/pkgs/applications/editors/emacs-modes/scala-mode/default.nix
index 3b6361b9ef76..71a2993aba81 100644
--- a/pkgs/applications/editors/emacs-modes/scala-mode/default.nix
+++ b/pkgs/applications/editors/emacs-modes/scala-mode/default.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   buildInputs = [ emacs ];
 
   installPhase =
-    '' ensureDir "$out/share/emacs/site-lisp"
+    '' mkdir -p "$out/share/emacs/site-lisp"
        cp -v *.el *.elc "$out/share/emacs/site-lisp"
     '';
 
diff --git a/pkgs/applications/editors/emacs-modes/session-management-for-emacs/default.nix b/pkgs/applications/editors/emacs-modes/session-management-for-emacs/default.nix
index c78d40bcb5fe..08fb64002a09 100644
--- a/pkgs/applications/editors/emacs-modes/session-management-for-emacs/default.nix
+++ b/pkgs/applications/editors/emacs-modes/session-management-for-emacs/default.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   buildInputs = [emacs];
   
   installPhase = ''
-    ensureDir "$out/share/emacs/site-lisp"
+    mkdir -p "$out/share/emacs/site-lisp"
     cp lisp/*.el "$out/share/emacs/site-lisp/"
   '';
 
diff --git a/pkgs/applications/editors/jedit/default.nix b/pkgs/applications/editors/jedit/default.nix
index 5349f10c0c36..194f13a090cd 100644
--- a/pkgs/applications/editors/jedit/default.nix
+++ b/pkgs/applications/editors/jedit/default.nix
@@ -17,19 +17,19 @@ stdenv.mkDerivation {
   '';
 
   installPhase = ''
-    ensureDir $out/share/jEdit
+    mkdir -p $out/share/jEdit
     cp build/jedit.jar $out/share/jEdit
-    ensureDir $out/share/jEdit/modes
+    mkdir -p $out/share/jEdit/modes
     cp -r modes/* $out/share/jEdit/modes
-    ensureDir $out/share/jEdit/icons
+    mkdir -p $out/share/jEdit/icons
     cp -r icons/* $out/share/jEdit/icons
-    ensureDir $out/share/jEdit/macros
+    mkdir -p $out/share/jEdit/macros
     cp -r macros/* $out/share/jEdit/macros
-    ensureDir $out/share/jEdit/doc
+    mkdir -p $out/share/jEdit/doc
     cp -r doc/* $out/share/jEdit/doc
     
     sed -i "s|Icon=.*|Icon=$out/share/jEdit/icons/jedit-icon48.png|g" package-files/linux/deb/jedit.desktop
-    ensureDir $out/share/applications
+    mkdir -p $out/share/applications
     mv package-files/linux/deb/jedit.desktop $out/share/applications/jedit.desktop
 
     patch package-files/linux/jedit << EOF
@@ -39,7 +39,7 @@ stdenv.mkDerivation {
     > 
     EOF
     sed -i "s|/usr/share/jEdit/@jar.filename@|$out/share/jEdit/jedit.jar|g" package-files/linux/jedit
-    ensureDir $out/bin
+    mkdir -p $out/bin
     cp package-files/linux/jedit $out/bin/jedit
     chmod +x $out/bin/jedit
   '';
diff --git a/pkgs/applications/editors/jedit/wrapper.nix b/pkgs/applications/editors/jedit/wrapper.nix
index 8af3d96918d8..1126a7278d6c 100644
--- a/pkgs/applications/editors/jedit/wrapper.nix
+++ b/pkgs/applications/editors/jedit/wrapper.nix
@@ -8,7 +8,7 @@ stdenv.mkDerivation {
     phases = "buildPhase";
 
     buildPhase = "
-ensureDir \$out/bin
+mkdir -p \$out/bin
 cat > \$out/bin/${jedit.name} << EOF
 #!/bin/sh
 exec $java -jar $jeditjar \\$*
diff --git a/pkgs/applications/editors/nedit/builder.sh b/pkgs/applications/editors/nedit/builder.sh
index 51b5f1836546..15706b0c37dd 100644
--- a/pkgs/applications/editors/nedit/builder.sh
+++ b/pkgs/applications/editors/nedit/builder.sh
@@ -3,7 +3,7 @@ source $stdenv/setup
 export NIX_CFLAGS_COMPILE="-DBUILD_UNTESTED_NEDIT -L$motif/lib $NIX_CFLAGS_COMPILE"
 
 installPhase() {
-    ensureDir $out/bin
+    mkdir -p $out/bin
     cp -p source/nedit source/nc $out/bin
 }
 
diff --git a/pkgs/applications/editors/nvi/default.nix b/pkgs/applications/editors/nvi/default.nix
index c759f977b0d4..81e0dd35db95 100644
--- a/pkgs/applications/editors/nvi/default.nix
+++ b/pkgs/applications/editors/nvi/default.nix
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
   '';
 
   installPhase = ''
-    ensureDir $out/bin $out/share/vi/catalog
+    mkdir -p $out/bin $out/share/vi/catalog
     for a in dutch english french german ru_SU.KOI8-R spanish swedish; do
       cp ../catalog/$a $out/share/vi/catalog
     done
@@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
     ln -s $out/bin/nvi $out/bin/ex
     ln -s $out/bin/nvi $out/bin/view
 
-    ensureDir $out/share/man/man1
+    mkdir -p $out/share/man/man1
     cp ../docs/USD.doc/vi.man/vi.1 $out/share/man/man1/nvi.1
     ln -s $out/share/man/man1/nvi.1 $out/share/man/man1/vi
     ln -s $out/share/man/man1/nvi.1 $out/share/man/man1/ex