From 8a057e77affc16bf477faa0983529229c11bce68 Mon Sep 17 00:00:00 2001 From: fiddlosopher Date: Tue, 6 Nov 2007 00:07:17 +0000 Subject: Modified build procedure to allow compilation with GHC 6.8: + 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 --- debian/rules | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) (limited to 'debian/rules') diff --git a/debian/rules b/debian/rules index 8e3dc240f..ba2baf00e 100755 --- a/debian/rules +++ b/debian/rules @@ -1,7 +1,7 @@ #!/usr/bin/make -f # # debian/rules for pandoc. -# Copyright © 2006 Recai OktaÅŸ +# Copyright © 2006 Recai Oktaþ # # This file is based on John Goerzen's Cabal Debian template. # See http://www.n-heptane.com/nhlab/repos/cabalDebianTemplate/ @@ -33,8 +33,22 @@ endif # Export all variables which will be used in various stages of build process. export PREFIX DESTDIR DATADIR DOCDIR HCFLAGS +# Special code dealing with ghc 6.6 -> 6.8 transition. +.PHONY: cabalbackup cabalrestore +cabalbackup: $(THIS).cabal.ghccurrent +$(THIS).cabal.ghccurrent: + if [ -f $(THIS).cabal.ghc66 ]; then \ + mv $(THIS).cabal $(THIS).cabal.ghccurrent; \ + cp $(THIS).cabal.ghc66 $(THIS).cabal; \ + fi +cabalrestore: + # Special code dealing with ghc 6.6 -> 6.8 transition. + if [ -f $(THIS).cabal.ghc66 ] && [ -f $(THIS).cabal.ghccurrent ]; then \ + mv $(THIS).cabal.ghccurrent $(THIS).cabal; \ + fi + configure: configure-stamp -configure-stamp: +configure-stamp: cabalbackup dh_testdir $(MAKE) configure @@ -120,5 +134,5 @@ binary-arch: build install dh_md5sums -a dh_builddeb -a -binary: binary-indep binary-arch +binary: binary-indep binary-arch cabalrestore .PHONY: build clean binary-indep binary-arch binary install build-indep install-indep -- cgit v1.2.3