]> Zhao Yanbai Git Server - minix.git/commitdiff
Adding back the world target, as well as a warning.
authorLionel Sambuc <lionel@minix3.org>
Thu, 15 Nov 2012 12:54:53 +0000 (13:54 +0100)
committerLionel Sambuc <lionel@minix3.org>
Thu, 15 Nov 2012 15:12:45 +0000 (16:12 +0100)
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

Makefile

index aebdd2a51a7e38e7d92772f26a751e3bfbc9eeef..96a897179393643d06fd4a45cd9925d986407661 100644 (file)
--- 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