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

  function, so obsolete it.

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

8 files changed, 12 insertions, 12 deletions

diff --git a/pkgs/development/tools/misc/cbrowser/default.nix b/pkgs/development/tools/misc/cbrowser/default.nix
index 50dc907a780..bf927db2793 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 c27c7ab291a..3cba5cd2e76 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 fef5a71201a..6e6464a590b 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 f679577a3f1..69503782d6e 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 dddb577edbf..1cb491df8d1 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 906770e9066..e7adb30d316 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 30afee4586b..f4b38f4f7ab 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 a883024690a..48a823c3c65 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"
   '';