path: root/INSTALL
diff options
authorfiddlosopher <fiddlosopher@788f1e2b-df1e-0410-8736-df70ead52e1b>2007-11-25 01:51:36 +0000
committerfiddlosopher <fiddlosopher@788f1e2b-df1e-0410-8736-df70ead52e1b>2007-11-25 01:51:36 +0000
commit99d8d45b744c98f08e12296667efebef52bfc8b6 (patch)
treecce59f311e629ce0b823e95f09a3e46d7f409dee /INSTALL
parent3703f625be18201be1e6bb87235ada1b39029290 (diff)
+ Makefile now checks GHC version. If GHC is 6.6, pandoc.cabal.ghc66
is copied to pandoc.cabal, and the old pandoc.cabal is copied to pandoc.cabal.orig. Otherwise, pandoc.cabal is copied to pandoc.cabal.orig but otherwise unmodified. This way, the Makefile will work properly with either GHC 6.6 or 6.8. + The changes in debian/rules from r1066 have been reverted, since they are no longer needed. Also, debian/rules has been converted to UTF-8. + INSTALL instructions have been updated accordingly. git-svn-id: 788f1e2b-df1e-0410-8736-df70ead52e1b
Diffstat (limited to 'INSTALL')
1 files changed, 6 insertions, 6 deletions
diff --git a/INSTALL b/INSTALL
index 41e3059ac..5334bac85 100644
@@ -38,12 +38,6 @@ Installing Pandoc
1. Change to the directory containing the Pandoc distribution.
- If you are using a version of Cabal < 1.2 (which you probably
- are unless you've upgraded to GHC 6.8), do the following before
- proceeding:
- cp pandoc.cabal pandoc.cabal.orig
- cp pandoc.cabal.ghc66 pandoc.cabal
2. Compile:
@@ -167,6 +161,12 @@ tarball, unpack, and type:
This will install the pandoc executable and the Haskell libraries,
but not the shell scripts, man pages, or other documentation.
+Note: If you are using GHC 6.6.*, you will need to start by
+replacing `pandoc.cabal` with a version suitable for GHC 6.6:
+ cp pandoc.cabal pandoc.cabal.orig
+ cp pandoc.cabal.ghc66 pandoc.cabal
Installing pandoc using MacPorts