@@ -101,15 +101,6 @@ Installing Pandoc using Make
101101
102102 make test
103103
104− Note: if you see errors like the following, they're due to differences
105− between different versions of the xhtml library, and can safely be
106− disregarded:
107−
108− 2c2
109− < <html xmlns="http://www.w3.org/1999/xhtml"
110− ---
111− > <html
112−
1131044. Install:
114105
115106 sudo make install
@@ -151,11 +142,12 @@ Installing pandoc using Cabal
151142
152143Change to the directory containing the pandoc source, and type:
153144
154− runhaskell Setup.hs configure # add --user if you have installed
155− # prerequisites locally with cabal-install
156− runhaskell Setup.hs build
157− runhaskell Setup.hs haddock # optional, to build library documentation
158− runhaskell Setup.hs install # this one as root or sudo
145+ runhaskell Setup configure # add --user if you have installed prerequisites
146+ # locally using cabal-install
147+ runhaskell Setup build
148+ runhaskell Setup haddock # optional, to build library documentation
149+ runhaskell Setup test # optional, to run test suite
150+ runhaskell Setup install # this one as root or sudo, or add --user
159151
160152This will install the pandoc executable and the Haskell libraries,
161153but not the shell scripts, man pages, or other documentation.
@@ -164,8 +156,8 @@ You may just want the executable, or just the libraries. This
164156can be controlled with configuration flags (the `-` negates the
165157flag):
166158
167− runhaskell Setup.hs configure -f-library # just the executable
168− runhaskell Setup.hs configure -f-executable # just the libraries
159+ runhaskell Setup configure -f-library # just the executable
160+ runhaskell Setup configure -f-executable # just the libraries
169161
170162You can also specify the directory tree into which pandoc will be
171163installed using the `--prefix=` option to `configure`. For more details,
@@ -181,14 +173,14 @@ delimited code blocks. This feature requires the [`highlighting-kate` library].
181173If you are using Cabal to compile pandoc, specify the `highlighting` flag in
182174the configure step:
183175
184− runhaskell Setup.hs configure -fhighlighting
176+ runhaskell Setup configure -fhighlighting
185177
186178If you are using the Makefile:
187179
188180 CABALOPTS=-fhighlighting make
189181
190182If you have already built pandoc, you may need to do a `make clean` or
191−`runhaskell Setup.hs clean` first.
183+`runhaskell Setup clean` first.
192184
193185[`highlighting-kate` library]: http://johnmacfarlane.net/highlighting-kate
194186