diff options
| author | Brian Anderson <banderson@mozilla.com> | 2012-03-07 19:22:02 -0800 |
|---|---|---|
| committer | Brian Anderson <banderson@mozilla.com> | 2012-03-07 19:22:02 -0800 |
| commit | bdec806848ed7286ad56865b5f53b99dc0965810 (patch) | |
| tree | 0cb50a056330ed71ed214874f4f1b10d20b57422 /src/rustdoc | |
| parent | 2bfed908e39f162532be56d9680295bb383ddcf2 (diff) | |
| download | rust-bdec806848ed7286ad56865b5f53b99dc0965810.tar.gz rust-bdec806848ed7286ad56865b5f53b99dc0965810.zip | |
rustdoc: Look for pandoc in ~/.cabal
Diffstat (limited to 'src/rustdoc')
| -rw-r--r-- | src/rustdoc/config.rs | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/rustdoc/config.rs b/src/rustdoc/config.rs index bcc3d53fd08..79bc9a2743b 100644 --- a/src/rustdoc/config.rs +++ b/src/rustdoc/config.rs @@ -193,8 +193,12 @@ fn maybe_find_pandoc( let possible_pandocs = alt maybe_pandoc_cmd { some(pandoc_cmd) { [pandoc_cmd] } none { - // FIXME (1936): Need to be able to expand ~ to look in .cabal - ["pandoc"] + ["pandoc"] + alt os::homedir() { + some(dir) { + [path::connect(dir, ".cabal/bin/pandoc")] + } + none { [] } + } } }; |