org: include more pdf doc, yet failing html-doc and contrib/

contrib is added as profile/share/org/contrib, better ideas
welcome. profile/share/doc/org-7.5/contrib could be an option but then
one needs to adjust personal emacs config to point to the new
contrib/lisp dir with each upgrade.

svn path=/nixpkgs/trunk/; revision=26805

pkgs/applications/editors/emacs-modes/org/default.nix

@@ -19,11 +19,21 @@ stdenv.mkDerivation rec {
            -e "s|^prefix=.*$|prefix=$out|g"
     '';
 
+  #XXX: fails because of missing UTILITIES/manfull.pl, currently not
+  # included in the release tarball, but git.
+
+  #postBuild =
+  #  '' make doc
+  #  '';
+
   installPhase =
     '' make install install-info
 
        ensureDir "$out/share/doc/${name}"
-       cp -v doc/orgcard*.{pdf,txt} "$out/share/doc/${name}"
+       cp -v doc/org*.{html,pdf,txt} "$out/share/doc/${name}"
+
+       ensureDir "$out/share/org"
+       cp -R contrib "$out/share/org/contrib"
     '';
 
   meta = {