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

function, so obsolete it.

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

pkgs/servers/http/apache-modules/mod_python/default.nix

@@ -20,7 +20,7 @@ stdenv.mkDerivation {
 
   preInstall = ''
     installFlags="LIBEXECDIR=$out/modules $installFlags"
-    ensureDir $out/modules
+    mkdir -p $out/modules
   '';
 
   passthru = { inherit apacheHttpd; };

pkgs/servers/http/apache-modules/tomcat-connectors/builder.sh

@@ -4,5 +4,5 @@ tar xfvz $src
 cd tomcat-connectors-*-src/native
 ./configure --with-apxs=$apacheHttpd/bin/apxs --with-java-home=$jdk
 make
-ensureDir $out/modules
+mkdir -p $out/modules
 cp apache-2.0/mod_jk.so $out/modules

pkgs/servers/http/jboss/default.nix

@@ -14,7 +14,7 @@ stdenv.mkDerivation {
   '';
   
   installPhase = ''
-    ensureDir $out
+    mkdir -p $out
     cp -av * $out
   '';
   

pkgs/servers/http/jboss/jdbc/mysql/builder.sh

@@ -1,5 +1,5 @@
 buildInputs="$mysql_jdbc"
 source $stdenv/setup
 
-ensureDir $out/server/default/lib
+mkdir -p $out/server/default/lib
 ln -s $mysql_jdbc/share/java/mysql-connector-java.jar $out/server/default/lib/mysql-connector-java.jar

pkgs/servers/http/jetty/6.1/bin-builder.sh

@@ -3,5 +3,5 @@ set -e
 source $stdenv/setup
 
 unzip $src
-ensureDir $out/$name
+mkdir -p $out/$name
 mv jetty*/* $out/$name

pkgs/servers/http/joseki/default.nix

@@ -72,12 +72,12 @@ rec {
 
     mv lib/slf4j-simple-*.jar lib/obsolete
 
-    ensureDir "$out/share"
+    mkdir -p "$out/share"
     TARGET="$out/share/${name}-dist"
     cp -r . "$TARGET"
     ln -s  "$TARGET/lib" "$out/lib"
     chmod a+x "$TARGET/bin/"*
-    ensureDir "$out/bin"
+    mkdir -p "$out/bin"
 
     echo -e '#! /bin/sh\nls "'"$TARGET"'"/bin' > "$out/bin/jena-list-commands"
     echo '#! /bin/sh' >> "$out/bin/jena-command"

pkgs/servers/http/tomcat/axis2/builder.sh

@@ -2,12 +2,12 @@ source $stdenv/setup
 
 unzip $src
 cd axis2-*
-ensureDir $out
+mkdir -p $out
 cp -av * $out
 cd webapp
 ant
 cd ..
-ensureDir $out/webapps
+mkdir -p $out/webapps
 cp dist/axis2.war $out/webapps
 cd $out/webapps
 mkdir axis2

pkgs/servers/http/tomcat/jdbc/mysql/builder.sh

@@ -1,4 +1,4 @@
 source $stdenv/setup
 
-ensureDir $out/lib
+mkdir -p $out/lib
 ln -s $mysql_jdbc/share/java/mysql-connector-java.jar $out/lib/mysql-connector-java.jar