head	1.2;
access;
symbols
	RELEASE_5_EOL:1.1;
locks; strict;
comment	@# @;


1.2
date	2008.07.18.20.05.16;	author obraun;	state dead;
branches;
next	1.1;

1.1
date	2007.12.31.10.55.21;	author obraun;	state Exp;
branches;
next	;


desc
@@


1.2
log
@Upgrade ghc to 6.8.3.
@
text
@diff -rNup ./utils/hsc2hs/Makefile.orig ./utils/hsc2hs/Makefile
--- ./utils/hsc2hs/Makefile.orig	Mon Dec 10 19:11:32 2007
+++ ./utils/hsc2hs/Makefile	Sun Dec 30 21:53:09 2007
@@@@ -39,9 +39,15 @@@@ else
 extra_flags=
 endif
 
+ifneq "$(GMP_INCLUDE_DIRS)" ""
+gmp_includes=-I$(GMP_INCLUDE_DIRS)
+else
+gmp_includes=
+endif
+
 $(INPLACE_HS): Makefile $(FPTOOLS_TOP)/mk/config.mk
 	echo "import System.Cmd; import System.Environment; import System.Exit" > $@@
-	echo "main = do args <- getArgs; rawSystem \"$(FPTOOLS_TOP_ABS)/$(GHC_HSC2HS_DIR_REL)/$(HS_PROG)\" (\"--template=$(FPTOOLS_TOP_ABS)/$(GHC_HSC2HS_DIR_REL)/template-hsc.h\":\"--cc=$(CC)\":\"--ld=$(CC)\"$(patsubst %,:\"%\",$(extra_flags)):\"--cflag=-D__GLASGOW_HASKELL__=$(ProjectVersionInt)\":\"-I$(FPTOOLS_TOP_ABS)/$(GHC_INCLUDE_DIR_REL)\":\"-I$(FPTOOLS_TOP_ABS)/gmp/gmpbuild\":args) >>= exitWith" >> $@@
+	echo "main = do args <- getArgs; rawSystem \"$(FPTOOLS_TOP_ABS)/$(GHC_HSC2HS_DIR_REL)/$(HS_PROG)\" (\"--template=$(FPTOOLS_TOP_ABS)/$(GHC_HSC2HS_DIR_REL)/template-hsc.h\":\"--cc=$(CC)\":\"--ld=$(CC)\"$(patsubst %,:\"%\",$(extra_flags)):\"--cflag=-D__GLASGOW_HASKELL__=$(ProjectVersionInt)\":\"-I$(FPTOOLS_TOP_ABS)/$(GHC_INCLUDE_DIR_REL)\":\"-I$(FPTOOLS_TOP_ABS)/gmp/gmpbuild\":\"$(gmp_includes)\":args) >>= exitWith" >> $@@
 
 $(INPLACE_PROG): $(INPLACE_HS)
 	$(HC) --make $< -o $@@
@


1.1
log
@Reactivate dependency on libgmp-port
@
text
@@

