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

  function, so obsolete it.

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

11 files changed, 15 insertions, 15 deletions

diff --git a/pkgs/tools/graphics/cfdg/default.nix b/pkgs/tools/graphics/cfdg/default.nix
index 435305f1e2af8..26df8818b2b6e 100644
--- a/pkgs/tools/graphics/cfdg/default.nix
+++ b/pkgs/tools/graphics/cfdg/default.nix
@@ -16,10 +16,10 @@ rec {
   phaseNames = ["doMake" "copyFiles"];
 
   copyFiles = a.fullDepEntry ''
-    ensureDir $out/bin
+    mkdir -p $out/bin
     cp cfdg $out/bin/
 
-    ensureDir $out/share/doc/${name}
+    mkdir -p $out/share/doc/${name}
     cp *.txt $out/share/doc/${name}
   '' ["defEnsureDir" "doMake"];
       
diff --git a/pkgs/tools/graphics/cuneiform/default.nix b/pkgs/tools/graphics/cuneiform/default.nix
index 232b6c5464a96..13f7d4b7f6fc4 100644
--- a/pkgs/tools/graphics/cuneiform/default.nix
+++ b/pkgs/tools/graphics/cuneiform/default.nix
@@ -22,7 +22,7 @@ rec {
   libc = if a.stdenv ? glibc then a.stdenv.glibc else "";
 
   doCmake = a.fullDepEntry(''
-    ensureDir $PWD/builddir
+    mkdir -p $PWD/builddir
     cd builddir
     export NIX_LDFLAGS="$NIX_LDFLAGS -ldl -L$out/lib"
     cmake .. -DCMAKE_BUILD_TYPE=debug -DCMAKE_INSTALL_PREFIX=$out -DDL_LIB=${libc}/lib
diff --git a/pkgs/tools/graphics/dcraw/default.nix b/pkgs/tools/graphics/dcraw/default.nix
index 8ee02710b05fd..959241d30abf2 100644
--- a/pkgs/tools/graphics/dcraw/default.nix
+++ b/pkgs/tools/graphics/dcraw/default.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   '';
 
   buildPhase = ''
-    ensureDir $out/bin
+    mkdir -p $out/bin
     set +e
     sh install
     set -e
diff --git a/pkgs/tools/graphics/exiftags/default.nix b/pkgs/tools/graphics/exiftags/default.nix
index 32048db4154ea..531e17b92cbb6 100644
--- a/pkgs/tools/graphics/exiftags/default.nix
+++ b/pkgs/tools/graphics/exiftags/default.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation {
   '';
 
   preInstall = ''
-    ensureDir $out/bin $out/man/man1
+    mkdir -p $out/bin $out/man/man1
   '';
 
   meta = {
diff --git a/pkgs/tools/graphics/glxinfo/default.nix b/pkgs/tools/graphics/glxinfo/default.nix
index 02db33f92cb19..ed29b743d546f 100644
--- a/pkgs/tools/graphics/glxinfo/default.nix
+++ b/pkgs/tools/graphics/glxinfo/default.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation {
   ";
 
   installPhase = "
-    ensureDir $out/bin
+    mkdir -p $out/bin
     cp glxinfo glxgears $out/bin/
   ";
 }
diff --git a/pkgs/tools/graphics/jhead/default.nix b/pkgs/tools/graphics/jhead/default.nix
index 2d98a1efdce11..c497d60aef9a1 100644
--- a/pkgs/tools/graphics/jhead/default.nix
+++ b/pkgs/tools/graphics/jhead/default.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation {
   '';
 
   preInstall = ''
-    ensureDir $out/bin
+    mkdir -p $out/bin
   '';
 
   meta = {
diff --git a/pkgs/tools/graphics/pdfread/default.nix b/pkgs/tools/graphics/pdfread/default.nix
index 1fc14445bbdbb..fd26174f197a2 100644
--- a/pkgs/tools/graphics/pdfread/default.nix
+++ b/pkgs/tools/graphics/pdfread/default.nix
@@ -27,13 +27,13 @@ stdenv.mkDerivation {
   '';
 
   installPhase = ''
-    ensureDir $out/bin
+    mkdir -p $out/bin
     cp pdfread.py $out/bin
     chmod +x $out/bin/pdfread.py
 
     LIBSUFFIX=lib/${python.libPrefix}/site-packages/
     PYDIR=$out/$LIBSUFFIX
-    ensureDir $PYDIR
+    mkdir -p $PYDIR
     cp -R *.py pylrs $PYDIR
 
     wrapProgram $out/bin/pdfread.py --prefix PYTHONPATH : $PYTHONPATH:${pil}/$LIBSUFFIX/PIL:$PYDIR \
diff --git a/pkgs/tools/graphics/ploticus/builder.sh b/pkgs/tools/graphics/ploticus/builder.sh
index 89d4e3b98eaf0..2fb16b259bdcf 100644
--- a/pkgs/tools/graphics/ploticus/builder.sh
+++ b/pkgs/tools/graphics/ploticus/builder.sh
@@ -5,12 +5,12 @@ preBuild() {
 }
 
 preInstall() {
-  ensureDir $out/bin
+  mkdir -p $out/bin
 }
 
 postInstall() {
   # Install the "prefabs".
-  ensureDir $out/share/ploticus/prefabs &&		\
+  mkdir -p $out/share/ploticus/prefabs &&		\
   cd .. &&						\
   cp -rv prefabs/* $out/share/ploticus/prefabs
 
diff --git a/pkgs/tools/graphics/qrdecode/default.nix b/pkgs/tools/graphics/qrdecode/default.nix
index 16c91720964a5..edd0a96c689f2 100644
--- a/pkgs/tools/graphics/qrdecode/default.nix
+++ b/pkgs/tools/graphics/qrdecode/default.nix
@@ -34,7 +34,7 @@ rec {
     cd ..
   '' ["doMake"];
   createDirs = fullDepEntry ''
-    ensureDir $out/bin $out/lib $out/include $out/share
+    mkdir -p $out/bin $out/lib $out/include $out/share
   '' ["defEnsureDir"];
 
   name = "libdecodeqr-" + version;
diff --git a/pkgs/tools/graphics/transfig/builder.sh b/pkgs/tools/graphics/transfig/builder.sh
index f128c4ce36487..c466f759446ce 100644
--- a/pkgs/tools/graphics/transfig/builder.sh
+++ b/pkgs/tools/graphics/transfig/builder.sh
@@ -31,8 +31,8 @@ buildPhase() {
 }
 
 preInstall() {
-    ensureDir $out
-    ensureDir $out/lib
+    mkdir -p $out
+    mkdir -p $out/lib
 }
 
 genericBuild
diff --git a/pkgs/tools/graphics/welkin/default.nix b/pkgs/tools/graphics/welkin/default.nix
index 0076b2a4a8622..d02b38b41279b 100644
--- a/pkgs/tools/graphics/welkin/default.nix
+++ b/pkgs/tools/graphics/welkin/default.nix
@@ -32,7 +32,7 @@ rec {
   doDeploy = a.simplyShare "welkin";
 
   createBin = a.fullDepEntry ''
-    ensureDir "$out/bin"
+    mkdir -p "$out/bin"
     echo "#! ${a.stdenv.shell}" > "$out/bin/welkin"
     echo "export JAVA_HOME=${jre}" >> "$out/bin/welkin"
     echo "\"$out/share/welkin/welkin.sh\" \"\$@\"" >> "$out/bin/welkin"