From: PHO <pho@cielonegro.org>
Date: Mon, 6 Feb 2012 23:01:28 +0000 (+0900)
Subject: Update the building guide for ghc-7.4.1
X-Git-Tag: GHC-7.4.1~2^2~12
X-Git-Url: https://git.cielonegro.org/gitweb.cgi?a=commitdiff_plain;h=f4afb39c623b1c077a5ffeddbad2b4f451f0d975;p=pkgsrc-ghc.git

Update the building guide for ghc-7.4.1
---

diff --git a/Makefile b/Makefile
index a50424a..3e50ccd 100644
--- a/Makefile
+++ b/Makefile
@@ -131,7 +131,10 @@ ${WRKDIR}/stamp-rewrite-hc-paths: ${WRKDIR}/stamp-extract-hc
 				   -e "s#\\[\\[GHC_SOURCE_PATH\\]\\]#`${PWD_CMD}`#g" $$i > $$i.tmp; \
 			${MV} -f $$i.tmp $$i; \
 		done && \
-		${TOUCH} -r inplace/lib/package.conf.d */*/package-data.mk */*/*/package-data.mk && \
+		${TOUCH} -r inplace/lib/package.conf.d \
+					*/*/package-data.mk \
+					*/*/*/package-data.mk \
+					compiler/stage?/build/Config.hs && \
 		${TOUCH} ${.TARGET}
 
 ${WRKDIR}/stamp-bootstrap-ghc: ${WRKDIR}/stamp-rewrite-hc-paths
diff --git a/TODO b/TODO
index cc117cc..d4c5fdb 100644
--- a/TODO
+++ b/TODO
@@ -25,7 +25,6 @@ Extract the source archive and duplicate the source tree, one for
 Build some configuration files::
 
     $ cd ghc-{VERSION}-target
-    $ ln -s /bin/pwd utils/ghc-pwd/ghc-pwd
     $ ./configure --enable-hc-boot
     $ echo "INTEGER_LIBRARY = integer-simple" > mk/build.mk
     $ gmake bootstrapping-files
@@ -63,7 +62,8 @@ contents::
 
 Copy some configuration files from the ``-target`` tree::
 
-    $ cp ../ghc-{VERSION}-target/includes/{ghcautoconf.h,DerivedConstants.h,GHCConstants.h} includes/
+    $ cp -r ../ghc-{VERSION}-target/includes/dist-{ghcconstants,derivedconstants} includes/
+    $ cp ../ghc-{VERSION}-target/includes/ghcautoconf.h includes/
 
 Build it::