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

function, so obsolete it.

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

pkgs/development/compilers/abc/builder-binjar.sh

@@ -1,4 +1,4 @@
 source $stdenv/setup
 
-ensureDir $out/jars
+mkdir -p $out/jars
 cp $src $out/jars/$jarname.jar

pkgs/development/compilers/abc/builder.sh

@@ -23,7 +23,7 @@ EOF
 
 $apacheAnt/bin/ant jars
 
-ensureDir $out/jars
+mkdir -p $out/jars
 
 cp lib/abc.jar $out/jars
 cp lib/abc-runtime.jar $out/jars
@@ -31,7 +31,7 @@ cp lib/abc-testing.jar $out/jars
 cp lib/abc-complete.jar $out/jars
 
 # Create the executable abc script
-ensureDir $out/bin
+mkdir -p $out/bin
 cat > $out/bin/abc <<EOF
 #! $SHELL -e
 

pkgs/development/compilers/abc/jasmin/builder.sh

@@ -20,5 +20,5 @@ EOF
 
 ant jasmin-jar
 
-ensureDir $out/jars/
+mkdir -p $out/jars/
 mv lib/jasminclasses-foo.jar $out/jars/jasmin.jar

pkgs/development/compilers/abc/polyglot/builder.sh

@@ -6,6 +6,6 @@ cd polyglot-*
 ant polyglot-jar
 ant cup
 
-ensureDir $out/jars/
+mkdir -p $out/jars/
 mv lib/java_cup.jar $out/jars/
 mv lib/polyglot*.jar $out/jars/

pkgs/development/compilers/abc/soot/builder.sh

@@ -15,5 +15,5 @@ EOF
 
 ant classesjar
 
-ensureDir $out/jars/
+mkdir -p $out/jars/
 mv lib/sootclasses-foo.jar $out/jars/soot.jar

pkgs/development/compilers/adobe-flex-sdk/default.nix

@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   installPhase = ''
     unzip ${src}
     t=$out/opt/flex-sdk
-    ensureDir $t $out/bin
+    mkdir -p $t $out/bin
     mv * $t
     rm $t/bin/*.exe $t/bin/*.bat
     sed 's/␍$//' -i $t/bin/*

pkgs/development/compilers/aspectj/builder.sh

@@ -7,7 +7,7 @@ output.dir=$out
 context.javaPath=$jre
 EOF
 
-ensureDir $out
+mkdir -p $out
 $jre/bin/java -jar $src -text props
 
 echo "Removing files at top level"

pkgs/development/compilers/ccl/default.nix

@@ -21,10 +21,10 @@ rec {
   phaseNames = ["doUnpack" "doPatchElf" "doCopy"];
 
   doCopy = a.fullDepEntry ''
-    ensureDir "$out/share"
+    mkdir -p "$out/share"
     cp -r . "$out/share/ccl-installation"
 
-    ensureDir "$out/bin"
+    mkdir -p "$out/bin"
     for i in $(find . -maxdepth 1 -type f -perm +111); do
       echo -e '#! /bin/sh\n'"$out/share/ccl-installation/$(basename "$i")"'"$@"\n' > "$out"/bin/"$(basename "$i")"
       chmod a+x "$out"/bin/"$(basename "$i")"

pkgs/development/compilers/cmucl/binary.nix

@@ -26,7 +26,7 @@ stdenv.mkDerivation {
   name = "cmucl-binary-${version}";
 
   buildCommand = ''
-    ensureDir $out
+    mkdir -p $out
     tar -C $out -xjf ${dist}
     patchelf --set-interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" \
       $out/bin/lisp

pkgs/development/compilers/eql/default.nix

@@ -64,7 +64,7 @@ rec {
 
   doDeploy = a.fullDepEntry (''
     cd ..
-    ensureDir $out/bin $out/lib/eql/ $out/include $out/include/gen $out/lib
+    mkdir -p $out/bin $out/lib/eql/ $out/include $out/include/gen $out/lib
     cp -r . $out/lib/eql/build-dir
     ln -s $out/lib/eql/build-dir/eql $out/bin
     ln -s $out/lib/eql/build-dir/src/*.h $out/include

pkgs/development/compilers/fpc/lazarus.nix

@@ -23,7 +23,7 @@ rec {
   preBuild = fullDepEntry (''
     export NIX_LDFLAGS='-lXi -lX11 -lglib-2.0 -lgtk-x11-2.0 -lgdk-x11-2.0 -lc -lXext -lpango-1.0 -latk-1.0 -lgdk_pixbuf-2.0 -lcairo'
     export LCL_PLATFORM=gtk2
-    ensureDir $out/share
+    mkdir -p $out/share
     tar xf ${fpc.src} --strip-components=1 -C $out/share -m
     sed -e 's@/usr/fpcsrc@'"$out/share/fpcsrc@" -i ide/include/unix/lazbaseconf.inc
   '') 

pkgs/development/compilers/ghc/6.10.2-binary.nix

@@ -70,11 +70,11 @@ stdenv.mkDerivation rec {
   postInstall =
     (if stdenv.isDarwin then
       ''
-        ensureDir $out/frameworks/GMP.framework/Versions/A
+        mkdir -p $out/frameworks/GMP.framework/Versions/A
         ln -s ${gmp}/lib/libgmp.dylib $out/frameworks/GMP.framework/GMP
         ln -s ${gmp}/lib/libgmp.dylib $out/frameworks/GMP.framework/Versions/A/GMP
         # !!! fix this
-        ensureDir $out/frameworks/GNUeditline.framework/Versions/A
+        mkdir -p $out/frameworks/GNUeditline.framework/Versions/A
         ln -s ${libedit}/lib/libeditline.dylib $out/frameworks/GNUeditline.framework/GNUeditline
         ln -s ${libedit}/lib/libeditline.dylib $out/frameworks/GNUeditline.framework/Versions/A/GNUeditline
 

pkgs/development/compilers/ghc/6.12.1-binary.nix

@@ -75,7 +75,7 @@ stdenv.mkDerivation rec {
   postInstall =
     (if stdenv.isDarwin then
       ''
-        ensureDir $out/frameworks/GMP.framework/Versions/A
+        mkdir -p $out/frameworks/GMP.framework/Versions/A
         ln -s ${gmp}/lib/libgmp.dylib $out/frameworks/GMP.framework/GMP
         ln -s ${gmp}/lib/libgmp.dylib $out/frameworks/GMP.framework/Versions/A/GMP
         # !!! fix this

pkgs/development/compilers/ghc/6.4.2-binary.nix

@@ -49,10 +49,10 @@ stdenv.mkDerivation {
   # that the executables work with no special setup.
   postInstall = if stdenv.isDarwin then ''
 
-    ensureDir $out/frameworks/GMP.framework/Versions/A
+    mkdir -p $out/frameworks/GMP.framework/Versions/A
     ln -s ${gmp}/lib/libgmp.dylib $out/frameworks/GMP.framework/GMP
     ln -s ${gmp}/lib/libgmp.dylib $out/frameworks/GMP.framework/Versions/A/GMP
-    ensureDir $out/frameworks/GNUreadline.framework/Versions/A
+    mkdir -p $out/frameworks/GNUreadline.framework/Versions/A
     ln -s ${readline}/lib/libreadline.dylib $out/frameworks/GNUreadline.framework/GNUreadline
     ln -s ${readline}/lib/libreadline.dylib $out/frameworks/GNUreadline.framework/Versions/A/GNUreadline
 

pkgs/development/compilers/ghc/6.6.1.nix

@@ -20,7 +20,7 @@ stdenv.mkDerivation (rec {
   };
 
   postInstall = ''
-    ensureDir "$out/nix-support"
+    mkdir -p "$out/nix-support"
     echo "# Path to the GHC compiler directory in the store" > $out/nix-support/setup-hook
     echo "ghc=$out" >> $out/nix-support/setup-hook
     echo ""         >> $out/nix-support/setup-hook

pkgs/development/compilers/ghc/with-packages.nix

@@ -15,9 +15,9 @@ stdenv.mkDerivation rec {
     linkedTopDir="$out/lib"
     linkedPkgDir="$linkedTopDir/package.conf.d"
 
-    ensureDir $out/bin
-    ensureDir $linkedTopDir
-    ensureDir $linkedPkgDir
+    mkdir -p $out/bin
+    mkdir -p $linkedTopDir
+    mkdir -p $linkedPkgDir
 
     echo "Linking GHC core libraries:"
 

pkgs/development/compilers/ghc/wrapper.nix

@@ -8,7 +8,7 @@ stdenv.mkDerivation {
 
   unpackPhase = "true";
   installPhase = ''
-    ensureDir $out/bin
+    mkdir -p $out/bin
     cp $GHCGetPackages $out/bin/ghc-get-packages.sh
     chmod 755 $out/bin/ghc-get-packages.sh
     for prg in ghc ghci ghc-${ghc.version} ghci-${ghc.version}; do
@@ -41,7 +41,7 @@ stdenv.mkDerivation {
     done
     EOF
     chmod +x $out/bin/ghc-packages
-    ensureDir $out/nix-support
+    mkdir -p $out/nix-support
     ln -s $out/nix-support/propagated-build-inputs $out/nix-support/propagated-user-env-packages
   '';
 

pkgs/development/compilers/gnatboot/default.nix

@@ -17,7 +17,7 @@ stdenv.mkDerivation {
   dontStrip=1;
 
   installPhase = ''
-    ensureDir $out
+    mkdir -p $out
     cp -R * $out
     set +e
     for a in $out/bin/* ; do

pkgs/development/compilers/go/default.nix

@@ -47,7 +47,7 @@ stdenv.mkDerivation {
           else throw "Unsupported system";
 
   installPhase = ''
-    ensureDir "$out/bin"
+    mkdir -p "$out/bin"
     export GOROOT="$(pwd)/"
     export GOBIN="$out/bin"
     export PATH="$GOBIN:$PATH"
@@ -57,7 +57,7 @@ stdenv.mkDerivation {
 
     # Handle Libraries and make them availabale under /share/go.
     export GOLIB="pkg/"$GOOS"_"$GOARCH
-    ensureDir "$out/lib/go/$GOLIB"
+    mkdir -p "$out/lib/go/$GOLIB"
     cp -r ./$GOLIB $out/lib/go/pkg/
 
     # this line set $AS $CC $GC $LD
@@ -75,7 +75,7 @@ stdenv.mkDerivation {
       --set "GOARCH" "$GOARCH"
 
     # Copy the emacs configuration for Go files.
-    ensureDir "$out/share/emacs/site-lisp"
+    mkdir -p "$out/share/emacs/site-lisp"
     cp ./misc/emacs/* $out/share/emacs/site-lisp/ # */
   '';
 

pkgs/development/compilers/gwt/builder.sh

@@ -1,14 +1,14 @@
 source $stdenv/setup
 
 tar xfvj $src
-ensureDir $out
+mkdir -p $out
 cp -av $name $out
 
 # Create wrapper scripts so that the GWT compiler/host work
 
 libPath="$libstdcpp5/lib:$glib/lib:$gtk/lib:$atk/lib:$pango/lib:$libX11/lib:$libXt/lib:$out/$name/mozilla-1.7.12"
 
-ensureDir $out/bin
+mkdir -p $out/bin
 
 cat > $out/bin/gwt-compile <<EOF
 #!/bin/sh

pkgs/development/compilers/haxe/default.nix

@@ -79,7 +79,7 @@ let
 
       # probably rpath should be set properly
       installPhase = ''
-        ensureDir $out/lib/haxe
+        mkdir -p $out/lib/haxe
         cp -r bin $out/bin
         wrapProgram "$out/bin/haxe" \
           --set "LD_LIBRARY_PATH" $zlib/lib \
@@ -107,7 +107,7 @@ let
         buildPhase = ''
           cd std/tools/${name};
           haxe *.hxml
-          ensureDir $out/bin
+          mkdir -p $out/bin
           mv ${name} $out/bin/
         '';
 

pkgs/development/compilers/jdk/builder.sh

@@ -3,7 +3,7 @@ source $stdenv/setup
 
 unzip $src || true
 
-ensureDir $out
+mkdir -p $out
 mv $dirname/* $out/
 
 # Remove crap in the root directory.

pkgs/development/compilers/jdk/dlj-bundle-builder.sh

@@ -10,7 +10,7 @@ patchelf --interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" --set-rpath
 echo "constructing JDK and JRE installations"
 if test -z "$installjdk"; then
   sh ${construct} . tmp-linux-jdk tmp-linux-jre
-  ensureDir $out
+  mkdir -p $out
   cp -R tmp-linux-jre/* $out
 else
   sh ${construct} . $out tmp-linux-jre

pkgs/development/compilers/jdk/ibm-builder.sh

@@ -17,7 +17,7 @@ fi
 
 tar zxf $pathname || true
 
-ensureDir $out
+mkdir -p $out
 mv $dirname/* $out/
 
 # Remove crap in the root directory.

pkgs/development/compilers/llvm/dragonegg.nix

@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   buildInputs = [ llvm gmp mpfr mpc ];
 
   installPhase = ''
-    ensureDir $out/lib $out/share/doc/${name}
+    mkdir -p $out/lib $out/share/doc/${name}
     cp -d dragonegg.so $out/lib
     cp README COPYING $out/share/doc/${name}
   '';

pkgs/development/compilers/neko/default.nix

@@ -31,7 +31,7 @@ composableDerivation.composableDerivation {} ( fixed : {
       src/tools/install.neko
     sed -i "s@/usr/local@$out@" Makefile vm/load.c
     # make sure that nekotools boot finds the neko executable and not our wrapper:
-    ensureDir $out/{bin,lib}
+    mkdir -p $out/{bin,lib}
 
     sed -i "s@\"neko\"@\".neko-wrapped\"@" src/tools/nekoboot.neko
     ln -s ./neko bin/.neko-wrapped

pkgs/development/compilers/nvidia-cg-toolkit/default.nix

@@ -28,19 +28,19 @@ stdenv.mkDerivation rec {
         patchelf --set-interpreter ${stdenv.glibc}/lib/ld-linux-*.so.? "bin/$b"
     done
     # FIXME: cgfxcat and cginfo need more patchelf
-    ensureDir "$out/bin/"
+    mkdir -p "$out/bin/"
     cp -v bin/* "$out/bin/"
-    ensureDir "$out/include/"
+    mkdir -p "$out/include/"
     cp -v -r include/Cg/ "$out/include/"
-    ensureDir "$out/lib/"
+    mkdir -p "$out/lib/"
     [ "$system" = "x86_64-linux" ] && cp -v lib64/* "$out/lib/"
     [ "$system" = "i686-linux" ] && cp -v lib/* "$out/lib/"
     for mandir in man1 man3 manCg manCgFX
     do
-        ensureDir "$out/share/man/$mandir/"
+        mkdir -p "$out/share/man/$mandir/"
         cp -v share/man/$mandir/* "$out/share/man/$mandir/"
     done
-    ensureDir "$out/share/doc/$name/"
+    mkdir -p "$out/share/doc/$name/"
     cp -v -r local/Cg/* "$out/share/doc/$name/"
   '';
   

pkgs/development/compilers/ocaml/3.10.0.nix

@@ -19,7 +19,7 @@ stdenv.mkDerivation (rec {
     sed -e "s@/bin/cat@$CAT@" -i config/auto-aux/sharpbang
   '';
   postBuild = ''
-    ensureDir $out/include
+    mkdir -p $out/include
     ln -sv $out/lib/ocaml/caml $out/include/caml
   '';
 

pkgs/development/compilers/ocaml/3.11.1.nix

@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
     patch -p0 < ${./mips64.patch}
   '';
   postBuild = ''
-    ensureDir $out/include
+    mkdir -p $out/include
     ln -sv $out/lib/ocaml/caml $out/include/caml
   '';
 

pkgs/development/compilers/ocaml/3.12.1.nix

@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
     sed -e "s@/bin/cat@$CAT@" -i config/auto-aux/sharpbang
   '';
   postBuild = ''
-    ensureDir $out/include
+    mkdir -p $out/include
     ln -sv $out/lib/ocaml/caml $out/include/caml
   '';
 

pkgs/development/compilers/ocaml/ber-metaocaml-003.nix

@@ -43,7 +43,7 @@ stdenv.mkDerivation rec {
     cd ..
   '';
   postBuild = ''
-    ensureDir $out/include
+    mkdir -p $out/include
     ln -sv $out/lib/ocaml/caml $out/include/caml
   '';
   postInstall = ''

pkgs/development/compilers/ocaml/metaocaml-3.09.nix

@@ -19,7 +19,7 @@ stdenv.mkDerivation (rec {
     sed -e "s@/bin/cat@$CAT@" -i config/auto-aux/sharpbang
   '';
   postBuild = ''
-    ensureDir $out/include
+    mkdir -p $out/include
     ln -sv $out/lib/ocaml/caml $out/include/caml
   '';
 

pkgs/development/compilers/opa/default.nix

@@ -43,7 +43,7 @@ stdenv.mkDerivation rec {
     done
 
     # Install emacs mode.
-    ensureDir $out/share/emacs/site-lisp/opa
+    mkdir -p $out/share/emacs/site-lisp/opa
     install -m 0644 -v ./utils/emacs/{opa-mode.el,site-start.el} $out/share/emacs/site-lisp/opa
   '';
 

pkgs/development/compilers/openjdk-darwin/default.nix

@@ -9,7 +9,7 @@ stdenv.mkDerivation {
   };
 
   installPhase = ''
-    ensureDir $out
+    mkdir -p $out
     cp -vR * $out/
   '';
 

pkgs/development/compilers/openjdk/default.nix

@@ -70,7 +70,7 @@ stdenv.mkDerivation rec {
   ];
 
   postUnpack = ''
-    ensureDir drops
+    mkdir -p drops
     cp ${jaxp_src} drops/${jaxp_src_name}
     cp ${jaxws_src} drops/${jaxws_src_name}
     cp ${jaf_src} drops/${jaf_src_name}
@@ -114,14 +114,14 @@ stdenv.mkDerivation rec {
   '';
 
   installPhase = ''
-    ensureDir $out
+    mkdir -p $out
     cp -av build/*/j2${if jreOnly then "re" else "sdk"}-image/* $out
   '';
 #  '' + (if jreOnly then "" else ''
 #    if [ -z $jre ]; then
 #      exit 0
 #    fi
-#    ensureDir $jre
+#    mkdir -p $jre
 #    cp -av build/*/j2re-image/* $jre
 #  '');
 

pkgs/development/compilers/pakcs/default.nix

@@ -41,7 +41,7 @@ stdenv.mkDerivation {
     # The Prolog sources must be built in their final directory.
     (cd $out/curry2prolog/ ; make)
 
-    ensureDir $out/share/emacs/site-lisp/curry-pakcs
+    mkdir -p $out/share/emacs/site-lisp/curry-pakcs
     for e in "$out/tools/emacs/"*.el ; do
       ln -s $out/tools/emacs/$e $out/share/emacs/site-lisp/curry-pakcs/;
     done

pkgs/development/compilers/qi/default.nix

@@ -16,8 +16,8 @@ let
 	allBuild = fullDepEntry ("
 		(sleep 0.1; echo ) | clisp install.txt;
 		(sleep 0.1; echo -e '1\n(quit)\n' ) | sh Qi-Linux-CLisp 
-		ensureDir \$out/share
-		ensureDir \$out/bin
+		mkdir -p \$out/share
+		mkdir -p \$out/bin
 		cp -r . \$out/share/Qi-9.1
 		echo -e '#! ${shell}
 		arg1=\${1:-'\$out'/share/Qi-9.1/startup.txt}

pkgs/development/compilers/scala/default.nix

@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   };
 
   installPhase = ''
-    ensureDir $out
+    mkdir -p $out
     rm bin/*.bat
     mv * $out
   '';

pkgs/development/compilers/stalin/default.nix

@@ -13,19 +13,19 @@ stdenv.mkDerivation rec {
   buildPhase = '' ./build '';
 
   installPhase = ''
-    ensureDir "$out/bin"
+    mkdir -p "$out/bin"
     cp stalin "$out/bin"
 
-    ensureDir "$out/man/man1"
+    mkdir -p "$out/man/man1"
     cp stalin.1 "$out/man/man1"
 
-    ensureDir "$out/share/emacs/site-lisp"
+    mkdir -p "$out/share/emacs/site-lisp"
     cp stalin.el "$out/share/emacs/site-lisp"
 
-    ensureDir "$out/doc/${name}"
+    mkdir -p "$out/doc/${name}"
     cp README "$out/doc/${name}"
 
-    ensureDir "$out/share/${name}/include"
+    mkdir -p "$out/share/${name}/include"
     cp "include/"* "$out/share/${name}/include"
 
     substituteInPlace "$out/bin/stalin" \

pkgs/development/compilers/tinycc/default.nix

@@ -50,7 +50,7 @@ let version = "0.9.25"; in
     postInstall = ''
       makeinfo --force tcc-doc.texi || true
 
-      ensureDir "$out/share/info"
+      mkdir -p "$out/share/info"
       mv tcc-doc.info* "$out/share/info"
 
       echo 'int main () { printf ("it works!\n"); exit(0); }' | \

pkgs/development/compilers/visual-c++/builder.sh

@@ -1,6 +1,6 @@
 source $stdenv/setup
 
-ensureDir $out
+mkdir -p $out
 
 cabextract $src
 
@@ -12,7 +12,7 @@ rm ../vc* # reduce temporary disk usage a bit
 while read target; do
     read source
     echo "$source -> $target"
-    ensureDir $out/$(dirname $target)
+    mkdir -p $out/$(dirname $target)
     cp -p "$source" $out/"$target"
 done < $filemap
 

pkgs/development/compilers/visual-c++/test/builder.sh

@@ -2,5 +2,5 @@ source $stdenv/setup
 source $visualcpp/setup
 source $windowssdk/setup
 
-ensureDir $out/bin
+mkdir -p $out/bin
 cl "$(cygpath -w $src)" /Fe"$(cygpath -w $out/bin/hello.exe)" user32.lib

pkgs/development/compilers/vs90wrapper/default.nix

@@ -3,7 +3,7 @@
 stdenv.mkDerivation {
   name = "visual-studio-9.0";
   buildCommand = ''
-    ensureDir $out/bin
+    mkdir -p $out/bin
     ln -s "/cygdrive/c/Program Files/Microsoft Visual Studio 9.0/VC/vcpackages/vcbuild.exe" $out/bin/vcbuild.exe
   '';
 }