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: https://pandoc.googlecode.com/svn/trunk@1095 788f1e2b-df1e-0410-8736-df70ead52e1b
to support unusual ghc installations, for example:
GHC=/opt/ghc/bin/ghc GHC_PKG=/opt/ghc/bin/ghc-pkg make
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1081 788f1e2b-df1e-0410-8736-df70ead52e1b
+ pandoc.cabal now uses Cabal configurations and requires Cabal >=1.2.
+ An alternative pandoc.cabal.ghc66 is provided for those who have older
versions of Cabal.
+ Debian build process has been modified to use pandoc.cabal.ghc66,
as a temporary measure until GHC 6.8 gets into debian unstable.
+ INSTALL instructions have been updated.
+ Makefile has been updated to accommodate changes in pandoc.cabal.
+ pandoc.cabal.ghc68 has been removed, since the default version now
works with GHC 6.8.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1066 788f1e2b-df1e-0410-8736-df70ead52e1b
+ Added library Text.Pandoc.Include, with a template haskell
function $(includeStrFrom fname) to include a file as a string
constant at compile time.
+ This removes the need for the 'templates' directory or Makefile
target. These have been removed.
+ The base source directory has been changed from src to .
+ A new 'data' directory has been added, containing the ASCIIMathML.js
script, writer headers, and S5 files.
+ The src/wrappers directory has been moved to 'wrappers'.
+ The Text.Pandoc.ASCIIMathML library is no longer needed, since
Text.Pandoc.Writers.HTML can use includeStrFrom to include the
ASCIIMathML.js code directly. It has been removed.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1063 788f1e2b-df1e-0410-8736-df70ead52e1b
- New variables to make use in debian/rules: DATADIR, DOCDIR. Cabal uses
$prefix/pandoc-$VERSION/doc for the documentation files, where as the
Debian package uses $prefix/doc/pandoc. We need these variables to resolve
the conflict.
debian/rules:
- Set and export DATADIR, DOCDIR which controls the installation of document
files at install-program target.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1045 788f1e2b-df1e-0410-8736-df70ead52e1b
- For generic installations, use $prefix/share/pandoc-$VERSION/doc directory
to put all the documentation files. This fixes the issue of having two
copies of the library documentation (one in $prefix/share/pandoc-doc, the
other is in $prefix/share/pandoc-$VERSION).
- Remove uninstall-lib-doc target and move the relevant code to uninstall-all
target. Add extra code to remove the html directory. These changes fix the
issue of leaving the library documentation in $prefix/share/pandoc-$VERSION
uninstalled.
- Remove the confusing NAME and THIS variables and create new variables: PKG
(same as THIS), and PKGID ($PKG-$VERSION = $THIS-$VERSION). Remove RELNAME
(which is equal to PKGID). All these changes simplified things a bit in
"Cabal constants" section and uninstall-all target.
- Remove some Cabal constants for the sake of simplicity and add a few new
ones: PKGDATAPATH and PKGDOCPATH. We at least need a PKGDOCPATH variable to
install DOCS, as Cabal doesn't provide a command for this target (hence,
install-doc). I wish to set this variable by using ghc-pkg (just like
libdir in install-all), but this seems a bit difficult to me, as there is no
docdir variable in .installed-pkg-config and we would have to resort to an
unclean hack which extracts docdir from haddock-dir.
- Keep all non-critical steps (i.e. rmdir) quiet to reduce noise.
- Ensure to use stderr for all messages.
- Avoid forking a subshell in $(web_dest).
- A few unrelated cosmetic changes.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1043 788f1e2b-df1e-0410-8736-df70ead52e1b
+ On configure, compile 'Setup.hs' to 'setup' and use 'setup' as the build
command instead of 'runhaskell', which, on some platforms (such as s390,
alpha, m68k), throws the following error:
runhaskell Setup.hs configure --prefix=/usr
ghc-6.6.1: not built for interactive use
This causes a serious FTBFS bug. Closes: #440668 (from Debian BTS).
+ Setup.hs: revert changes.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1005 788f1e2b-df1e-0410-8736-df70ead52e1b
them in INSTALL. osx packaging was not working well, because of
the binary's dependency on a dynamic library GMP. A MacPorts port
will be provided instead.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@905 788f1e2b-df1e-0410-8736-df70ead52e1b
+ Added freebsd target to Makefile, which creates Makefile from
Makefile.in and creates distinfo.
+ Removed Makefile and distinfo from the repository.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@887 788f1e2b-df1e-0410-8736-df70ead52e1b
Mac OSX package, because the RTF tables don't render right
in Mac's preview app.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@790 788f1e2b-df1e-0410-8736-df70ead52e1b
Reason: In because in the process of making the debian package,
'var' gets overwritten with the local debian build directory as
DESTDIR. This will break future 'make uninstall's, which will
try to delete files from there instead of /usr/local (or wherever).
git-svn-id: https://pandoc.googlecode.com/svn/trunk@735 788f1e2b-df1e-0410-8736-df70ead52e1b
with HackageDB, which likes the cabal file to have the same name
as the tarball. Modified references to Pandoc.cabal in INSTALL
and Makefile.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@631 788f1e2b-df1e-0410-8736-df70ead52e1b
- Added groff man to list of output formats in index.txt
- Added a demo of man page creation to demos page
git-svn-id: https://pandoc.googlecode.com/svn/trunk@617 788f1e2b-df1e-0410-8736-df70ead52e1b
using pandoc's man page writer. Removed man pages
from repository, added (.md) templates. Modified
Makefile to generate man pages as part of the build
process.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@609 788f1e2b-df1e-0410-8736-df70ead52e1b
+ Include files built from templates in the distribution tarball,
so it can be built using Cabal and included in Hackage.
+ Remove unnecessary 'cabalize' step. We no longer build
Pandoc.cabal from a template.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@605 788f1e2b-df1e-0410-8736-df70ead52e1b
(This target is somewhat special as it should handle installing and
_registering_ the library in generic installations.) We can't rely on
'install-exec' to fix this bug (but we should depend on 'build-exec'
nevertheless), since the 'install-all' target already installs pandoc along
with the library files. Therefore we should install wrappers separately by
using a helper function which was specifically created to avoid code
duplication ('install-exec' target was also updated so as to use this
function).
git-svn-id: https://pandoc.googlecode.com/svn/trunk@426 788f1e2b-df1e-0410-8736-df70ead52e1b
markdown test suites in the 'test' directory (subdirectories
beginning with 'MarkdownTest_') and run them all. This allows
us to have multiple test suites, e.g. for 1.0 and for a beta
version.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@414 788f1e2b-df1e-0410-8736-df70ead52e1b