Simplified build process using template haskell.

+ Text/Pandoc/ASCIIMathML.hs, Text/Pandoc/DefaultHeaders.hs,
  and Text/Pandoc/Writers/S5.hs are no longer built in Setup.hs
  from templates in the templates/ directory.
+ Instead, they use template haskell to read data at compile
  time from the relevant files in data/.
+ Setup.hs is back to the default simple configuration.
+ Removed old templates and Extra-Tmp-Files field from
  pandoc.cabal.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@1357 788f1e2b-df1e-0410-8736-df70ead52e1b

1 files changed, 2 insertions, 10 deletions

diff --git a/Makefile b/Makefile
index e3b474f2c..f450d36d5 100644
--- a/Makefile
+++ b/Makefile
@@ -189,14 +189,6 @@ uninstall-doc:
 	-for f in $(man_all); do rm -f $(MANPATH)/$$f; done
 	rmdir $(PKGDOCPATH) 2>/dev/null ||:
 
-# Data file installation.
-.PHONY: install-data uninstall-data
-install-data: $(ODTREF)
-	$(INSTALL) -d $(PKGDATAPATH) && $(INSTALL_DATA) $(ODTREF) $(PKGDATAPATH)/
-uninstall-data:
-	-rm -f $(PKGDATAPATH)/$(notdir $(ODTREF))
-	rmdir $(PKGDATAPATH) 2>/dev/null ||:
-
 # Program only installation.
 .PHONY: install-exec uninstall-exec
 install-exec: build-exec
@@ -213,8 +205,8 @@ uninstall-exec:
 
 # Program + user documents installation.
 .PHONY: install-program uninstall-program
-install-program: install-exec install-data install-doc
-uninstall-program: uninstall-exec uninstall-doc uninstall-data
+install-program: install-exec install-doc
+uninstall-program: uninstall-exec uninstall-doc
 
 .PHONY: install-all uninstall-all
 # Full installation through Cabal: main + wrappers + user docs + lib + lib docs