From: Lionel Sambuc <lionel@minix3.org>
Date: Thu, 15 Nov 2012 12:54:53 +0000 (+0100)
Subject: Adding back the world target, as well as a warning.
X-Git-Tag: v3.2.1~210
X-Git-Url: http://zhaoyanbai.com/repos/%22http:/www.isc.org/icons/doxygen.png?a=commitdiff_plain;h=53da2c99407eee1da8da6eb0836073422843b632;p=minix.git

Adding back the world target, as well as a warning.

The 'world' target is a legacy target from the previous build system,
it is equivalent to the 'build' target in the netbsd build system.

A warning has been added to stop using it, but it still works as
expected.

Change-Id: I704a5c43d9775b6d66c15a43ba927ddb515aab80
---

diff --git a/Makefile b/Makefile
index aebdd2a51..96a897179 100644
--- a/Makefile
+++ b/Makefile
@@ -268,6 +268,18 @@ includes-gnu:	.PHONY includes-lib
 
 START_TIME!=	date
 
+.if defined(__MINIX)
+world: build .PHONY .MAKE
+	${MAKEDIRTARGET} . etcforce
+	@echo "WARNING: "
+	@echo "WARNING: The 'world' target is obsolete, please use 'build' instead."
+	@echo "WARNING: "
+
+etcforce: .PHONY .MAKE
+	${MAKEDIRTARGET} etc install-etc-files  DESTDIR=${DESTDIR:U/}
+
+.endif # defiend(__MINIX)
+
 build: .PHONY .MAKE
 .if defined(BUILD_DONE)
 	@echo "Build already installed into ${DESTDIR}"
@@ -295,7 +307,7 @@ distribution buildworld: .PHONY .MAKE
 	${MAKEDIRTARGET} . build NOPOSTINSTALL=1
 	${MAKEDIRTARGET} etc distribution INSTALL_DONE=1
 .if defined(__MINIX)
-	${MAKEDIRTARGET} releasetools hdboot
+	${MAKEDIRTARGET} releasetools do-hdboot
 .endif # defined(__MINIX)
 .if defined(DESTDIR) && ${DESTDIR} != "" && ${DESTDIR} != "/"
 	${MAKEDIRTARGET} . postinstall-fix-obsolete