Tidy-up bootstrapping rules.

diff --git a/bootstrap.mk b/bootstrap.mk
index 5f48c44a509a9a02ec3a1bfedca0cdc9c9ac7eb5..e178a9d6b31417da8b6af95d53d5c533db5df602 100644 (file)
--- 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: