aboutsummaryrefslogtreecommitdiff
path: root/Makefile
AgeCommit message (Collapse)AuthorFilesLines
2007-11-29Small improvements in Makefile:fiddlosopher1-3/+4
+ Added $(BUILDCMD) target, so setup doesn't get compiled every time. + Removed (now circular) dependency of templates on ./templates. git-svn-id: https://pandoc.googlecode.com/svn/trunk@1107 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-11-29Changed references to source directory in Makefile and pandoc.cabal.*.fiddlosopher1-1/+1
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1105 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-11-26Makefile: Add .exe extension to BUILDCMD if building on Windows.fiddlosopher1-1/+1
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1096 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-11-25+ Makefile now checks GHC version. If GHC is 6.6, pandoc.cabal.ghc66fiddlosopher1-2/+11
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
2007-11-17Use $(GHC) instead of ghc and make them user configurable through environmentroktas1-3/+3
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
2007-11-06Modified build procedure to allow compilation with GHC 6.8:fiddlosopher1-1/+1
+ 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
2007-11-03Reverted back to state as of r1062. The template haskell changesfiddlosopher1-2/+8
are more trouble than they're worth. git-svn-id: https://pandoc.googlecode.com/svn/trunk@1064 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-11-03Use template haskell to avoid the need for templates:fiddlosopher1-8/+2
+ 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
2007-10-07Makefile:roktas1-3/+5
- 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
2007-10-07Changes in Makefile:roktas1-79/+63
- 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
2007-09-03No need to add $(BUILDDIR) and $(BUILDCONF) to cleanup_files,fiddlosopher1-1/+1
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* The previous fix was wrong. Apply a proper fix and cross the fingers. :-)roktas1-2/+3
+ 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* Urgent fix to address the following issue:roktas1-1/+1
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-08-31Makefile: Get VERSION from cabal file, not Main.hs.fiddlosopher1-1/+1
git-svn-id: https://pandoc.googlecode.com/svn/trunk@973 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-08-27Removed local references to Portfile, since pandoc is now in thefiddlosopher1-2/+0
MacPorts repository. Updated INSTALL instructions and website. git-svn-id: https://pandoc.googlecode.com/svn/trunk@919 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-08-26Don't try to generate distinfo in Makefile. Make this usingfiddlosopher1-7/+2
'make makesum' in freebsd instead. git-svn-id: https://pandoc.googlecode.com/svn/trunk@915 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-08-26Make freeebsd and macports targets depend on tarball.fiddlosopher1-2/+2
git-svn-id: https://pandoc.googlecode.com/svn/trunk@911 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-08-26Removed osx-package specific files, and references to themfiddlosopher1-3/+1
in Makefiles. git-svn-id: https://pandoc.googlecode.com/svn/trunk@906 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-08-26Removed osx package targets in Makefile, and documentation forfiddlosopher1-54/+0
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-26Changes to website for new installation instructions.fiddlosopher1-0/+2
Removed OSX package. git-svn-id: https://pandoc.googlecode.com/svn/trunk@904 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-08-25Changed macport target to use 'openssl md5' instead offiddlosopher1-1/+1
'md5sum', which isn't found on OSX. git-svn-id: https://pandoc.googlecode.com/svn/trunk@899 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-08-25Separated $(web_dest) and website targets.fiddlosopher1-4/+6
Fixed a bug in index.txt.in. git-svn-id: https://pandoc.googlecode.com/svn/trunk@898 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-08-25Build web index from a template (including version number).fiddlosopher1-0/+2
git-svn-id: https://pandoc.googlecode.com/svn/trunk@896 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-08-25Updated Makefile for macports instead of macport.fiddlosopher1-1/+1
git-svn-id: https://pandoc.googlecode.com/svn/trunk@892 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-08-25Removed macports (renamed as macport).fiddlosopher1-1/+1
git-svn-id: https://pandoc.googlecode.com/svn/trunk@888 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-08-25Modifications in freebsd packaging:fiddlosopher1-7/+23
+ 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-25Added macport target to Makefile; Portfile is now built fromfiddlosopher1-0/+11
a template. git-svn-id: https://pandoc.googlecode.com/svn/trunk@886 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-08-15Simplified Makefile install-all and uninstall-all targets.fiddlosopher1-4/+4
git-svn-id: https://pandoc.googlecode.com/svn/trunk@853 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-08-15Fixed bug in tarball target in Makefile (should be RELNAME insteadfiddlosopher1-1/+1
of fullname). git-svn-id: https://pandoc.googlecode.com/svn/trunk@850 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-07-28Makefile: instead of testing for existence of pandocfiddlosopher1-4/+2
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-27Use HTML version of README in OSX installer, insteadfiddlosopher1-1/+1
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-23Use README instead of README.rtf in Welcome page offiddlosopher1-2/+2
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-16Backup 'var' before making deb and restore after.fiddlosopher1-0/+2
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-14Revamped website.fiddlosopher1-19/+3
git-svn-id: https://pandoc.googlecode.com/svn/trunk@699 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-07-11Use smartquotes and table of contents in generatingfiddlosopher1-1/+1
README.html. git-svn-id: https://pandoc.googlecode.com/svn/trunk@673 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-07-08Use -S option in building man pages.fiddlosopher1-1/+1
git-svn-id: https://pandoc.googlecode.com/svn/trunk@643 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-07-07Renamed Pandoc.cabal -> pandoc.cabal, for better compatibilityfiddlosopher1-1/+1
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-03Changes to website:fiddlosopher1-0/+1
- 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-02Don't use -S option in processing man pages,fiddlosopher1-1/+1
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-01Man pages are now generated from markdown templates,fiddlosopher1-3/+6
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-06-17Makefile changes:fiddlosopher1-10/+7
+ 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-02-27Strip executable binaries before installing.fiddlosopher1-0/+1
git-svn-id: https://pandoc.googlecode.com/svn/trunk@551 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-02-23'cp -a' does not work in BSD. Replace with 'cp -R'.fiddlosopher1-1/+1
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-01-10More website tweaks. Added demo of extra xsl configurationfiddlosopher1-1/+2
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-10Minor changes to Makefile required by changes to websitefiddlosopher1-1/+2
build system. git-svn-id: https://pandoc.googlecode.com/svn/trunk@488 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-01-09Reorganized Makefile target - now uses a subsidiary Makefilefiddlosopher1-12/+12
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-09Change to Makefile to add features page to website.fiddlosopher1-3/+3
git-svn-id: https://pandoc.googlecode.com/svn/trunk@467 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-01-05Fix the bug in 'install-all' target which does not install the wrappers.roktas1-7/+16
(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-05Nicer informational message in test-markdown target.fiddlosopher1-1/+2
git-svn-id: https://pandoc.googlecode.com/svn/trunk@420 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-01-04Changed test-markdown target in Makefile: Now it will find anyfiddlosopher1-3/+9
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
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-16 07:29:33 +0000