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

function, so obsolete it.

svn path=/nixpkgs/branches/stdenv-updates/; revision=31644
This commit is contained in:
Eelco Dolstra
2012-01-18 20:16:00 +00:00
parent f7159c195a
commit c556a6ea46
629 changed files with 931 additions and 939 deletions

View File

@@ -20,7 +20,7 @@ stdenv.mkDerivation {
mv config/Makefile.unix config/Makefile
substituteInPlace config/Makefile --replace BINDIR=/usr/local/bin BINDIR=$out
substituteInPlace config/Makefile --replace OCAMLLIB=/usr/local/lib/ocaml OCAMLLIB=$out/lib/ocaml/${ocaml_version}/site-lib/camlidl
ensureDir $out/lib/ocaml/${ocaml_version}/site-lib/camlidl/caml
mkdir -p $out/lib/ocaml/${ocaml_version}/site-lib/camlidl/caml
'';
meta = {

View File

@@ -40,7 +40,7 @@ stdenv.mkDerivation {
fi
export OCAMLFIND_DESTDIR="''$out/lib/ocaml/${ocaml_version}/site-lib/"
if test -n "$createFindlibDestdir"; then
ensureDir $OCAMLFIND_DESTDIR
mkdir -p $OCAMLFIND_DESTDIR
fi
}