Merge 'staging' into master

2014-08-08 20:13:23 +02:00
parent 629f7d055a 777617f987
commit 52d9c93abe
220 changed files with 611 additions and 2164 deletions
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
  '';

  preInstall = ''
-    ensureDir "$out/man/man1"
+    mkdir -p "$out/man/man1"
    sed -i -e 's/-o bin -g bin *//' Makefile
    sed -i -e '/chgrp/d' extras/Makefile
  '';