Updating from trunk. I resolved simple conflicts.

svn path=/nixpkgs/branches/stdenv-updates/; revision=25061
2010-12-11 12:47:00 +00:00
parent 3f1a32c266 97d4a54698
commit ee04ffcb55
106 changed files with 2507 additions and 484 deletions
--- a/pkgs/development/tools/misc/distcc/default.nix
+++ b/pkgs/development/tools/misc/distcc/default.nix
@@ -19,6 +19,7 @@ stdenv.mkDerivation {
  ''
    configureFlagsArray=( CFLAGS="-O2 -fno-strict-aliasing"
                          CXXFLAGS="-O2 -fno-strict-aliasing"
+			  --mandir=$out/share/man
                          ${if sysconfDir == "" then "" else "--sysconfdir=${sysconfDir}"}
                          ${if static then "LDFLAGS=-static" else ""}
                          --with${if static == true || popt == null then "" else "out"}-included-popt