From 1142c8872771c6cae84c7638c8f280b00f72d15d Mon Sep 17 00:00:00 2001
From: roktas <roktas@788f1e2b-df1e-0410-8736-df70ead52e1b>
Date: Mon, 3 Sep 2007 16:57:17 +0000
Subject: * 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
---
 Makefile         | 5 +++--
 Setup.hs         | 1 -
 debian/changelog | 5 +++--
 3 files changed, 6 insertions(+), 5 deletions(-)
 mode change 100755 => 100644 Setup.hs

diff --git a/Makefile b/Makefile
index 7a13a1628..67e227958 100644
--- a/Makefile
+++ b/Makefile
@@ -9,7 +9,7 @@ MANDIR    := man
 TESTDIR   := tests
 BUILDDIR  := dist
 BUILDCONF := .setup-config
-BUILDCMD  := ./Setup.hs
+BUILDCMD  := ./setup
 BUILDVARS := vars
 CONFIGURE := configure
 
@@ -118,9 +118,10 @@ $(WRAPPERS): %: $(SRCDIR)/wrappers/%.in $(SRCDIR)/wrappers/*.sh
 	@$(generate-shell-script)
 
 .PHONY: configure
-cleanup_files+=$(BUILDDIR) $(BUILDCONF) $(BUILDVARS)
+cleanup_files+=Setup.hi Setup.o $(BUILDCMD) $(BUILDDIR) $(BUILDCONF) $(BUILDVARS)
 configure: $(BUILDCONF) templates
 $(BUILDCONF): $(CABAL)
+	ghc -package Cabal Setup.hs -o $(BUILDCMD)
 	$(BUILDCMD) configure --prefix=$(PREFIX)
 	# Make configuration time settings persistent (definitely a hack).
 	@echo "PREFIX?=$(PREFIX)" >$(BUILDVARS)
diff --git a/Setup.hs b/Setup.hs
old mode 100755
new mode 100644
index cd7dc3277..9a994af67
--- a/Setup.hs
+++ b/Setup.hs
@@ -1,3 +1,2 @@
-#!/usr/bin/env runhaskell
 import Distribution.Simple
 main = defaultMain
diff --git a/debian/changelog b/debian/changelog
index 0d88fc7d2..d9d3a85b0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,8 +2,9 @@ pandoc (0.44) unstable; urgency=low
 
   [ Recai Oktaş ]
 
-  * Use ./Setup.hs instead of runhaskell, which, on some platforms (such as
-    s390, alpha, m68k), throws the following error:
+  * 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
-- 
cgit v1.2.3