Commit graph

113 commits

Author SHA1 Message Date
fiddlosopher
175a7e27ee No need to add $(BUILDDIR) and $(BUILDCONF) to cleanup_files,
because they are removed automatically by '$(BUILDCMD) clean'.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@1006 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-09-03 18:06:38 +00:00
roktas
1142c88727 * The previous fix was wrong. Apply a proper fix and cross the fingers. :-)
+ 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
2007-09-03 16:57:17 +00:00
roktas
b13e696c93 * Urgent fix to address the following issue:
http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=440668
  The below link of a similar bug explains things a bit more:
	http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=431843#22


git-svn-id: https://pandoc.googlecode.com/svn/trunk@1004 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-09-03 15:31:47 +00:00
fiddlosopher
0c09f4c529 Makefile: Get VERSION from cabal file, not Main.hs.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@973 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-08-31 06:25:00 +00:00
fiddlosopher
6bf82d8f29 Removed local references to Portfile, since pandoc is now in the
MacPorts repository.  Updated INSTALL instructions and website.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@919 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-08-27 22:18:36 +00:00
fiddlosopher
1a0c9d53a2 Don't try to generate distinfo in Makefile. Make this using
'make makesum' in freebsd instead.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@915 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-08-26 17:56:44 +00:00
fiddlosopher
19a51a2c6f Make freeebsd and macports targets depend on tarball.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@911 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-08-26 16:50:38 +00:00
fiddlosopher
71b70418f6 Removed osx-package specific files, and references to them
in Makefiles.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@906 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-08-26 15:46:44 +00:00
fiddlosopher
bdb55edd18 Removed osx package targets in Makefile, and documentation for
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
2007-08-26 15:43:44 +00:00
fiddlosopher
3462d2d1b6 Changes to website for new installation instructions.
Removed OSX package.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@904 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-08-26 15:41:45 +00:00
fiddlosopher
b46bedaf39 Changed macport target to use 'openssl md5' instead of
'md5sum', which isn't found on OSX.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@899 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-08-25 20:28:46 +00:00
fiddlosopher
021f152289 Separated $(web_dest) and website targets.
Fixed a bug in index.txt.in.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@898 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-08-25 18:39:06 +00:00
fiddlosopher
ab23086b1b Build web index from a template (including version number).
git-svn-id: https://pandoc.googlecode.com/svn/trunk@896 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-08-25 18:05:07 +00:00
fiddlosopher
4e252b18fc Updated Makefile for macports instead of macport.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@892 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-08-25 17:47:10 +00:00
fiddlosopher
ca0b8e97ca Removed macports (renamed as macport).
git-svn-id: https://pandoc.googlecode.com/svn/trunk@888 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-08-25 17:40:53 +00:00
fiddlosopher
64306faf7d Modifications in freebsd packaging:
+ 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
2007-08-25 17:35:53 +00:00
fiddlosopher
631d3930af Added macport target to Makefile; Portfile is now built from
a template.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@886 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-08-25 16:52:42 +00:00
fiddlosopher
c3b27348cc Simplified Makefile install-all and uninstall-all targets.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@853 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-08-15 21:51:38 +00:00
fiddlosopher
2892335680 Fixed bug in tarball target in Makefile (should be RELNAME instead
of fullname).


git-svn-id: https://pandoc.googlecode.com/svn/trunk@850 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-08-15 17:49:10 +00:00
fiddlosopher
ad31ae693b Makefile: instead of testing for existence of pandoc
symlink in build-exec, use the -f option in ln.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@814 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-07-28 03:56:27 +00:00
fiddlosopher
56016a998d Use HTML version of README in OSX installer, instead
of plain text or RTF (since RTF tables don't work
well in OSX Preview).


git-svn-id: https://pandoc.googlecode.com/svn/trunk@805 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-07-27 16:09:18 +00:00
fiddlosopher
64f9aee1ee Use README instead of README.rtf in Welcome page of
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
2007-07-23 23:13:43 +00:00
fiddlosopher
8d0fcce06a Backup 'var' before making deb and restore after.
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
2007-07-16 08:24:39 +00:00
fiddlosopher
9a96429a1a Revamped website.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@699 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-07-14 06:28:09 +00:00
fiddlosopher
dfdcec77a3 Use smartquotes and table of contents in generating
README.html.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@673 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-07-11 07:28:12 +00:00
fiddlosopher
dc7102eec3 Use -S option in building man pages.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@643 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-07-08 03:22:00 +00:00
fiddlosopher
98372ea277 Renamed Pandoc.cabal -> pandoc.cabal, for better compatibility
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
2007-07-07 05:25:44 +00:00
fiddlosopher
cd08eabd26 Changes to website:
- 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
2007-07-03 04:11:57 +00:00
fiddlosopher
6d6fafde16 Don't use -S option in processing man pages,
since the '--' in options will be read as an
En-dash.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@611 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-07-02 02:19:43 +00:00
fiddlosopher
5fbe057d27 Man pages are now generated from markdown templates,
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
2007-07-01 23:26:20 +00:00
fiddlosopher
3c46f8a600 Makefile changes:
+ 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
2007-06-17 16:20:50 +00:00
fiddlosopher
f99cedd236 Strip executable binaries before installing.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@551 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-02-27 07:16:20 +00:00
fiddlosopher
e0303dfc79 'cp -a' does not work in BSD. Replace with 'cp -R'.
Note that we don't want user and group to be preserved,
anyway.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@547 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-02-23 17:31:46 +00:00
fiddlosopher
9a2c653277 More website tweaks. Added demo of extra xsl configuration
and CSS in chunked xhtml produced from docbook.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@489 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-01-10 03:17:37 +00:00
fiddlosopher
3528c72d7e Minor changes to Makefile required by changes to website
build system.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@488 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-01-10 02:41:27 +00:00
fiddlosopher
c80f181137 Reorganized Makefile target - now uses a subsidiary Makefile
that can be run from the website directory for small changes.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@485 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-01-09 18:55:50 +00:00
fiddlosopher
11f1e77402 Change to Makefile to add features page to website.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@467 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-01-09 02:07:20 +00:00
roktas
06e6107f53 Fix the bug in 'install-all' target which does not install the wrappers.
(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
2007-01-05 10:16:15 +00:00
fiddlosopher
d4370154ff Nicer informational message in test-markdown target.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@420 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-01-05 01:20:18 +00:00
fiddlosopher
b6663c7e16 Changed test-markdown target in Makefile: Now it will find any
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
2007-01-04 17:23:30 +00:00
fiddlosopher
a8a0dd8766 Cleaned up and improved Makefile target for wrappers.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@408 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-01-03 17:22:55 +00:00
fiddlosopher
d262d163ed Improved Makefile 'wrappers' target. (Previously, it would build
all wrappers corresponding to src/wrappers/*.in.  Now, it will only
build wrappers in WRAPPERS.  This might be useful if we decide to
have 'hsmarkdown' be a wrapper on Windows and a symlink on unix.)


git-svn-id: https://pandoc.googlecode.com/svn/trunk@407 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-01-03 17:10:26 +00:00
fiddlosopher
bd31474d98 Improved test-markdown target in Makefile:
+ Use 'hsmarkdown' instead of building 'pandoc-strict' (which was a hack,
  and didn't work on Windows machines, anyway, due to the line ending problem)
+ Put top-level directory in path before running the test script, so that
  hsmarkdown can find 'pandoc' even if it hasn't been installed.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@406 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-01-02 21:30:07 +00:00
fiddlosopher
bcc608f3fd Fixed a bug in website generation, which only worked if 'pandoc'
and the wrappers had been installed.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@402 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-01-02 05:02:01 +00:00
fiddlosopher
5387ebd8db Added 'hsmarkdown' wrapper, designed to be used as a drop-in
replacement for Markdown.pl.  It calls pandoc with the options
'--from markdown --to html --strict' and disallows other options.
(Any command-line options will be interpreted as arguments.)


git-svn-id: https://pandoc.googlecode.com/svn/trunk@399 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-01-02 02:58:54 +00:00
fiddlosopher
b9a348338b Inserted a needed slash in the Makefile, after $(osx_pkg_name),
which is the name of a directory!


git-svn-id: https://pandoc.googlecode.com/svn/trunk@391 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-01-01 21:34:50 +00:00
fiddlosopher
4ea1b2bdc0 Merged 'strict' branch from r324. This adds a '--strict'
option to pandoc, which forces it to stay as close as possible
to official Markdown syntax.  


git-svn-id: https://pandoc.googlecode.com/svn/trunk@347 788f1e2b-df1e-0410-8736-df70ead52e1b
2006-12-30 22:51:49 +00:00
fiddlosopher
7cd9db048b Slight changes in website target:
+ history.html -> changelog.html
+ demo.html -> examples.html
+ Added title to changelog.html
+ Removed header div on html pages
+ Changed widths in css


git-svn-id: https://pandoc.googlecode.com/svn/trunk@319 788f1e2b-df1e-0410-8736-df70ead52e1b
2006-12-29 22:51:05 +00:00
fiddlosopher
369b99513d Make wrappers executable in the top-level directory, in case people
want to try them in place without installing.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@316 788f1e2b-df1e-0410-8736-df70ead52e1b
2006-12-29 21:41:09 +00:00
fiddlosopher
3c9fd01ad8 + Renamed web/demos.sh to mkdemos.sh
+ Added parameter for directory containing executables
+ Changed arithmetic statement for portability.
+ Modified Makefile accordingly.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@315 788f1e2b-df1e-0410-8736-df70ead52e1b
2006-12-29 21:25:13 +00:00