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

  function, so obsolete it.

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

23 files changed, 30 insertions, 30 deletions

diff --git a/pkgs/data/documentation/pthread-man-pages/default.nix b/pkgs/data/documentation/pthread-man-pages/default.nix
index a19c8bf8e9a..296ba982b8a 100644
--- a/pkgs/data/documentation/pthread-man-pages/default.nix
+++ b/pkgs/data/documentation/pthread-man-pages/default.nix
@@ -27,7 +27,7 @@ in
     '';
 
     patchPhase = ''
-      ensureDir "$out/share/man/man3"
+      mkdir -p "$out/share/man/man3"
 
       sed -i "linuxthreads/man/Makefile" \
           -e "s|MANDIR *=.*$|MANDIR = $out/share/man/man3| ;
diff --git a/pkgs/data/documentation/rnrs/builder.sh b/pkgs/data/documentation/rnrs/builder.sh
index 096dd2a8ca7..6ec5c855aba 100644
--- a/pkgs/data/documentation/rnrs/builder.sh
+++ b/pkgs/data/documentation/rnrs/builder.sh
@@ -4,9 +4,9 @@ source "$stdenv/setup" || exit 1
 
 echo "source is \`$src', report name is \`$reportName'"
 
-ensureDir "$out/share/info" &&					\
+mkdir -p "$out/share/info" &&					\
 makeinfo -o "$out/share/info/${reportName}.info" "$src"
 
 # XXX: HTML output is apparently broken.
-#ensureDir "$out/share/doc/${reportName}" &&			\
+#mkdir -p "$out/share/doc/${reportName}" &&			\
 #makeinfo -o "$out/share/doc/${reportName}/html" --html --force "$src"
diff --git a/pkgs/data/documentation/std-man-pages/default.nix b/pkgs/data/documentation/std-man-pages/default.nix
index 221f76c36fa..3b45da914d2 100644
--- a/pkgs/data/documentation/std-man-pages/default.nix
+++ b/pkgs/data/documentation/std-man-pages/default.nix
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
   };
 
   installPhase = ''
-    ensureDir $out/share/man
+    mkdir -p $out/share/man
     cp -R * $out/share/man
   '';
 
diff --git a/pkgs/data/fonts/andagii/default.nix b/pkgs/data/fonts/andagii/default.nix
index 8c2803c26d7..742f0bd0b4a 100644
--- a/pkgs/data/fonts/andagii/default.nix
+++ b/pkgs/data/fonts/andagii/default.nix
@@ -32,7 +32,7 @@ rec {
   '' ["addInputs"];
 
   doInstall = a.fullDepEntry (''
-    ensureDir "$out"/share/fonts/ttf/
+    mkdir -p "$out"/share/fonts/ttf/
     cp ANDAGII_.TTF "$out"/share/fonts/ttf/andagii.ttf
   '') ["defEnsureDir" "minInit"];
       
diff --git a/pkgs/data/fonts/bakoma-ttf/default.nix b/pkgs/data/fonts/bakoma-ttf/default.nix
index c7f1ad38f47..5f9cbec7a97 100644
--- a/pkgs/data/fonts/bakoma-ttf/default.nix
+++ b/pkgs/data/fonts/bakoma-ttf/default.nix
@@ -9,7 +9,7 @@ stdenv.mkDerivation {
   };
   
   buildPhase = "true";
-  installPhase = "ensureDir $out/share/fonts/truetype; cp ttf/*.ttf $out/share/fonts/truetype";
+  installPhase = "mkdir -p $out/share/fonts/truetype; cp ttf/*.ttf $out/share/fonts/truetype";
 
   meta = {
     description = "TrueType versions of the Computer Modern and AMS TeX Fonts";
diff --git a/pkgs/data/fonts/clearlyU/default.nix b/pkgs/data/fonts/clearlyU/default.nix
index 32050ac5c28..2761ed6f3e6 100644
--- a/pkgs/data/fonts/clearlyU/default.nix
+++ b/pkgs/data/fonts/clearlyU/default.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation {
 
   installPhase =
     ''
-      ensureDir $out/share/fonts
+      mkdir -p $out/share/fonts
       cp *.bdf $out/share/fonts
       cd $out/share/fonts
       mkfontdir 
diff --git a/pkgs/data/fonts/corefonts/default.nix b/pkgs/data/fonts/corefonts/default.nix
index 75896e059bf..b26d3bd8c1d 100644
--- a/pkgs/data/fonts/corefonts/default.nix
+++ b/pkgs/data/fonts/corefonts/default.nix
@@ -42,7 +42,7 @@ stdenv.mkDerivation {
     cabextract --lowercase viewer1.cab
   
     fontDir=$out/share/fonts/truetype
-    ensureDir $fontDir
+    mkdir -p $fontDir
     cp *.ttf $fontDir
 
     # Also put the EULA there to be on the safe side.
diff --git a/pkgs/data/fonts/dejavu-fonts/default.nix b/pkgs/data/fonts/dejavu-fonts/default.nix
index fb952f39604..505746b3edf 100644
--- a/pkgs/data/fonts/dejavu-fonts/default.nix
+++ b/pkgs/data/fonts/dejavu-fonts/default.nix
@@ -19,11 +19,11 @@ stdenv.mkDerivation {
     ln -s ${perl}/lib/*/*/unicore/* -t resources/
   '';
   installPhase = '' 
-    ensureDir $out/share/fonts/truetype
+    mkdir -p $out/share/fonts/truetype
     for i in $(find build -name '*.ttf'); do 
         cp $i $out/share/fonts/truetype; 
     done;
-    ensureDir $out/share/dejavu-fonts
+    mkdir -p $out/share/dejavu-fonts
     cp -r build/* $out/share/dejavu-fonts
   '';
 }
diff --git a/pkgs/data/fonts/fontWrap/default.nix b/pkgs/data/fonts/fontWrap/default.nix
index 927cc48575d..0d6750614d4 100644
--- a/pkgs/data/fonts/fontWrap/default.nix
+++ b/pkgs/data/fonts/fontWrap/default.nix
@@ -7,7 +7,7 @@ args : with args;
 	in with localDefs;
 let
 	doInstall = fullDepEntry ("
-		ensureDir \$out/share/fonts/
+		mkdir -p \$out/share/fonts/
 		cd \$out/share/fonts
 		for i in ${toString paths}; do
 			find \$i -type f -exec ln -s '{}' . ';' ;
diff --git a/pkgs/data/fonts/freefont-ttf/default.nix b/pkgs/data/fonts/freefont-ttf/default.nix
index e1427a79f0d..0ff2ec7ba16 100644
--- a/pkgs/data/fonts/freefont-ttf/default.nix
+++ b/pkgs/data/fonts/freefont-ttf/default.nix
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
   };
 
   installPhase = ''
-    ensureDir $out/share/fonts/truetype
+    mkdir -p $out/share/fonts/truetype
     cp *.ttf $out/share/fonts/truetype
   '';
 
diff --git a/pkgs/data/fonts/junicode/default.nix b/pkgs/data/fonts/junicode/default.nix
index eb7547e628f..1690f82aa37 100644
--- a/pkgs/data/fonts/junicode/default.nix
+++ b/pkgs/data/fonts/junicode/default.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation {
 
   installPhase =
     ''
-      ensureDir $out/share/fonts/junicode-ttf
+      mkdir -p $out/share/fonts/junicode-ttf
       cp *.ttf $out/share/fonts/junicode-ttf
     '';
 
diff --git a/pkgs/data/fonts/lmodern/default.nix b/pkgs/data/fonts/lmodern/default.nix
index a5dc014d8b4..831a3ddbd09 100644
--- a/pkgs/data/fonts/lmodern/default.nix
+++ b/pkgs/data/fonts/lmodern/default.nix
@@ -9,8 +9,8 @@ stdenv.mkDerivation {
   };
 
   installPhase = ''
-    ensureDir $out/texmf/
-    ensureDir $out/share/fonts/
+    mkdir -p $out/texmf/
+    mkdir -p $out/share/fonts/
 
     cp -r ./* $out/texmf/
     cp -r fonts/{opentype,type1} $out/share/fonts/
diff --git a/pkgs/data/fonts/mph-2b-damase/default.nix b/pkgs/data/fonts/mph-2b-damase/default.nix
index ceca85a0d23..7fe56987ad3 100644
--- a/pkgs/data/fonts/mph-2b-damase/default.nix
+++ b/pkgs/data/fonts/mph-2b-damase/default.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation {
     unzip $src;
   '';
   installPhase = ''
-    ensureDir $out/share/fonts/truetype
+    mkdir -p $out/share/fonts/truetype
     cp *.ttf $out/share/fonts/truetype
   '';
 }
diff --git a/pkgs/data/fonts/redhat-liberation-fonts/default.nix b/pkgs/data/fonts/redhat-liberation-fonts/default.nix
index cb1225763fd..c331b85029d 100644
--- a/pkgs/data/fonts/redhat-liberation-fonts/default.nix
+++ b/pkgs/data/fonts/redhat-liberation-fonts/default.nix
@@ -8,10 +8,10 @@ stdenv.mkDerivation rec {
   };
   
   installPhase = ''
-    ensureDir $out/share/fonts/truetype
+    mkdir -p $out/share/fonts/truetype
     cp -v *.ttf $out/share/fonts/truetype
 
-    ensureDir "$out/doc/${name}"
+    mkdir -p "$out/doc/${name}"
     cp -v AUTHORS ChangeLog COPYING License.txt README "$out/doc/${name}"
   '';
 
diff --git a/pkgs/data/fonts/ttf-bitstream-vera/default.nix b/pkgs/data/fonts/ttf-bitstream-vera/default.nix
index 57f463ba64c..64b18ffdaaa 100644
--- a/pkgs/data/fonts/ttf-bitstream-vera/default.nix
+++ b/pkgs/data/fonts/ttf-bitstream-vera/default.nix
@@ -9,7 +9,7 @@ stdenv.mkDerivation {
   buildPhase = "true";
   installPhase = "
     fontDir=$out/share/fonts/truetype
-    ensureDir $fontDir
+    mkdir -p $fontDir
     cp *.ttf $fontDir
   ";
 }
diff --git a/pkgs/data/fonts/unifont/default.nix b/pkgs/data/fonts/unifont/default.nix
index 76d2f3b28c1..79d1a090905 100644
--- a/pkgs/data/fonts/unifont/default.nix
+++ b/pkgs/data/fonts/unifont/default.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation {
   
   installPhase =
     ''
-      ensureDir $out/share/fonts $out/share/fonts/truetype
+      mkdir -p $out/share/fonts $out/share/fonts/truetype
       cp ${pcf} $out/share/fonts/unifont.pcf.gz
       gunzip < ${ttf} > $out/share/fonts/truetype/unifont.ttf
       cd $out/share/fonts
diff --git a/pkgs/data/fonts/vista-fonts/default.nix b/pkgs/data/fonts/vista-fonts/default.nix
index 73dcf368d72..19996f3f1a3 100644
--- a/pkgs/data/fonts/vista-fonts/default.nix
+++ b/pkgs/data/fonts/vista-fonts/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation {
   buildPhase = "true";
   
   installPhase = "
-    ensureDir $out/share/fonts/truetype; cp *.ttf $out/share/fonts/truetype
+    mkdir -p $out/share/fonts/truetype; cp *.ttf $out/share/fonts/truetype
   ";
 
   meta = {
diff --git a/pkgs/data/fonts/wqy-zenhei/default.nix b/pkgs/data/fonts/wqy-zenhei/default.nix
index ba38d8dc1ab..698ecc53046 100644
--- a/pkgs/data/fonts/wqy-zenhei/default.nix
+++ b/pkgs/data/fonts/wqy-zenhei/default.nix
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
 
   installPhase =
     ''
-      ensureDir $out/share/fonts
+      mkdir -p $out/share/fonts
       cp *.ttf $out/share/fonts
     '';
 
diff --git a/pkgs/data/misc/cacert/default.nix b/pkgs/data/misc/cacert/default.nix
index 6156cf17f16..4db1e84b485 100644
--- a/pkgs/data/misc/cacert/default.nix
+++ b/pkgs/data/misc/cacert/default.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
 
   installPhase =
     ''
-      ensureDir $out/etc
+      mkdir -p $out/etc
       bunzip2 < $src > $out/etc/ca-bundle.crt
     '';
 
diff --git a/pkgs/data/sgml+xml/schemas/docbook-5.0/builder.sh b/pkgs/data/sgml+xml/schemas/docbook-5.0/builder.sh
index e0cdb22e23c..96ad77eaa57 100644
--- a/pkgs/data/sgml+xml/schemas/docbook-5.0/builder.sh
+++ b/pkgs/data/sgml+xml/schemas/docbook-5.0/builder.sh
@@ -4,14 +4,14 @@ unpackFile $src
 
 cd docbook-*
 
-ensureDir $out/xml/rng
+mkdir -p $out/xml/rng
 cp -prv rng $out/xml/rng/docbook
 
-ensureDir $out/xml/dtd
+mkdir -p $out/xml/dtd
 cp -prv dtd $out/xml/dtd/docbook
 
-ensureDir $out/share/doc
+mkdir -p $out/share/doc
 cp -prv docs $out/share/doc/docbook
 
-ensureDir $out/share/docbook
+mkdir -p $out/share/docbook
 cp -prv tools $out/share/docbook/
diff --git a/pkgs/data/sgml+xml/schemas/xml-dtd/xhtml1/default.nix b/pkgs/data/sgml+xml/schemas/xml-dtd/xhtml1/default.nix
index cdcf62467db..8e626e3bc52 100644
--- a/pkgs/data/sgml+xml/schemas/xml-dtd/xhtml1/default.nix
+++ b/pkgs/data/sgml+xml/schemas/xml-dtd/xhtml1/default.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation {
 
   installPhase =
     ''
-      ensureDir $out/xml/dtd/xhtml1
+      mkdir -p $out/xml/dtd/xhtml1
       cp DTD/*.ent DTD/*.dtd $out/xml/dtd/xhtml1
 
       # Generate an XML catalog.
diff --git a/pkgs/data/sgml+xml/stylesheets/xslt/docbook-xsl-ns/default.nix b/pkgs/data/sgml+xml/stylesheets/xslt/docbook-xsl-ns/default.nix
index 978bbcbd5a7..c143ce16698 100644
--- a/pkgs/data/sgml+xml/stylesheets/xslt/docbook-xsl-ns/default.nix
+++ b/pkgs/data/sgml+xml/stylesheets/xslt/docbook-xsl-ns/default.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
 
   installPhase =
     ''
-      ensureDir $out/xml/xsl
+      mkdir -p $out/xml/xsl
       cd ..
       mv docbook-xsl-ns-* $out/xml/xsl/docbook
     '';
diff --git a/pkgs/data/sgml+xml/stylesheets/xslt/docbook-xsl/builder.sh b/pkgs/data/sgml+xml/stylesheets/xslt/docbook-xsl/builder.sh
index 1534806895c..9ac8e74d93a 100644
--- a/pkgs/data/sgml+xml/stylesheets/xslt/docbook-xsl/builder.sh
+++ b/pkgs/data/sgml+xml/stylesheets/xslt/docbook-xsl/builder.sh
@@ -1,6 +1,6 @@
 source $stdenv/setup
 
-ensureDir $out
+mkdir -p $out
 cd $out
 unpackFile $src
 mkdir xml