From: PHO <pho@cielonegro.org>
Date: Fri, 15 Feb 2013 00:19:40 +0000 (+0900)
Subject: Tidy-up bootstrapping rules.
X-Git-Tag: GHC-7.6.2^2~5
X-Git-Url: http://git.cielonegro.org/gitweb.cgi?p=pkgsrc-ghc.git;a=commitdiff_plain;h=490cac47ad12b8a68b5bdd887ce57ed1df82a2f4

Tidy-up bootstrapping rules.
---

diff --git a/bootstrap.mk b/bootstrap.mk
index 5f48c44..e178a9d 100644
--- a/bootstrap.mk
+++ b/bootstrap.mk
@@ -71,9 +71,14 @@ pre-configure:
 bootstrap:
 	@${ERROR_MSG} "You have already configured the package in a way\
 	that building bootstrapping compiler is impossible."
-	@${FAIL_MSG}  "Run \"${MAKE} clean\" first."
+	@${FAIL_MSG}  "Please run \"${MAKE} clean patch\" first."
+
+.elif !exists(${WRKDIR}/${DISTNAME}/rts/ghc.mk.orig)
+bootstrap:
+	@${FAIL_MSG} "Please run \"${MAKE} patch\" first."
+
 .else
-bootstrap: patch ${WRKDIR}/${BOOT_ARCHIVE}
+bootstrap: ${WRKDIR}/${BOOT_ARCHIVE}
 	@${PHASE_MSG} "Done creating" ${WRKDIR}/${BOOT_ARCHIVE}
 
 ${WRKDIR}/lndir: