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

function, so obsolete it.

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

pkgs/development/libraries/java/geoipjava/default.nix

@@ -15,7 +15,7 @@ stdenv.mkDerivation {
     '';
   installPhase =
     ''
-      ensureDir $out/share/java
+      mkdir -p $out/share/java
       cp maxmindgeoip.jar $out/share/java
     '';
   meta = {

pkgs/development/libraries/java/gwt-dragdrop/builder.sh

@@ -1,4 +1,4 @@
 source $stdenv/setup
 
-ensureDir $out/share/java
+mkdir -p $out/share/java
 cp $src $out/share/java/$name.jar

pkgs/development/libraries/java/gwt-widgets/builder.sh

@@ -2,5 +2,5 @@ source $stdenv/setup
 
 tar xfvz $src
 cd gwt-widgets-*
-ensureDir $out/share/java
+mkdir -p $out/share/java
 cp gwt-widgets-*.jar $out/share/java

pkgs/development/libraries/java/hsqldb/builder.sh

@@ -2,5 +2,5 @@ source $stdenv/setup
 
 unzip $src
 cd hsqldb*
-ensureDir $out
+mkdir -p $out
 cp -R * $out/

pkgs/development/libraries/java/hydra-ant-logger/default.nix

@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   '';
 
   installPhase = '' 
-    ensureDir "$out/lib/java"
+    mkdir -p "$out/lib/java"
     cp -v *.jar "$out/lib/java"
   '';
 }

pkgs/development/libraries/java/jetty-gwt/default.nix

@@ -7,7 +7,7 @@ stdenv.mkDerivation {
     sha256 = "17x8ss75rx9xjn93rq861mdn9d6gw87rbrf24blawa6ahhb56ppf";
   };
   buildCommand = ''
-    ensureDir $out/share/java
+    mkdir -p $out/share/java
     cp $src $out/share/java/$name.jar
   '';
 }

pkgs/development/libraries/java/jetty-util/default.nix

@@ -7,7 +7,7 @@ stdenv.mkDerivation {
     sha256 = "1ld94lb5dk7y6sjg1rq8zdk97wiy56ik5vbgy7yjj4f6rz5pxbyq";
   };
   buildCommand = ''
-    ensureDir $out/share/java
+    mkdir -p $out/share/java
     cp $src $out/share/java/$name.jar
   '';
 }

pkgs/development/libraries/java/rhino/default.nix

@@ -23,7 +23,7 @@ in
       '' find -name \*.jar -or -name \*.class -exec rm -v {} \;
 
          # The build process tries to download it by itself.
-         ensureDir "build/tmp-xbean"
+         mkdir -p "build/tmp-xbean"
          ln -sv "${xbeans}" "build/tmp-xbean/xbean.zip"
       '';
 
@@ -34,7 +34,7 @@ in
 
     # FIXME: Install javadoc as well.
     installPhase =
-      '' ensureDir "$out/lib/java"
+      '' mkdir -p "$out/lib/java"
          cp -v *.jar "$out/lib/java"
       '';
 

pkgs/development/libraries/java/saxon/default8.nix

@@ -11,7 +11,7 @@ stdenv.mkDerivation {
 
   buildCommand = "
     unzip $src -d $out
-    ensureDir $out/bin
+    mkdir -p $out/bin
     cat > $out/bin/saxon8 <<EOF
 #! $shell
 export JAVA_HOME=${jre}

pkgs/development/libraries/java/smack/builder.sh

@@ -2,5 +2,5 @@ source $stdenv/setup
 
 tar xfvz $src
 cd smack*
-ensureDir $out/share/java
+mkdir -p $out/share/java
 cp *.jar $out/share/java

pkgs/development/libraries/java/swt/builder.sh

@@ -7,12 +7,12 @@ export JAVA_HOME=${jdk}
 echo $JAVA_HOME=${jdk}
 sh ./build.sh make_swt make_atk
 
-ensureDir $out/lib
+mkdir -p $out/lib
 cp *.so $out/lib
 
 mkdir out
 javac -d out/ $(find org/ -name "*.java")
 
-ensureDir $out/jars
+mkdir -p $out/jars
 cp version.txt out/
 cd out && jar -c * > $out/jars/swt.jar

pkgs/development/libraries/java/xalanj/default.nix

@@ -24,7 +24,7 @@ in
 
     # FIXME: Install javadoc as well.
     installPhase =
-      '' ensureDir "$out/lib/java"
+      '' mkdir -p "$out/lib/java"
          cp -v build/x*.jar "$out/lib/java"
       '';
 

pkgs/development/libraries/java/xerces/default.nix

@@ -26,7 +26,7 @@ in
 
     # FIXME: Install javadoc as well.
     installPhase =
-      '' ensureDir "$out/lib/java"
+      '' mkdir -p "$out/lib/java"
          cp -v build/xerces*.jar "$out/lib/java"
       '';