Make world problems from 4.9 to 5.1

[Charles Swiger]

On Nov 26, 2003, at 8:25 PM, Lowell Gilbert wrote:
> "make world"?  Really?  You don't mean "make buildworld"?
> I guess the "world" target really does need to be removed.

Yes.  Or fixed to do something more reasonable...?

--- Makefile~   Sat Nov 29 00:02:13 2003
+++ Makefile    Sat Nov 29 00:18:07 2003
@@ -143,6 +143,13 @@
         @cd ${.CURDIR}; ${MAKE} pre-world
  .endif
         @cd ${.CURDIR}; ${MAKE} buildworld
+       @cd ${.CURDIR}; ${MAKE} buildkernel
+       @echo 
"--------------------------------------------------------------"
+       @echo ">>> About to run mergemaster & 'make install*' targets"
+       @echo 
"--------------------------------------------------------------"
+       @echo "
+       @/usr/src/usr.sbin/mergemaster/mergemaster.sh -p
+       @cd ${.CURDIR}; ${MAKE} -B installkernel
         @cd ${.CURDIR}; ${MAKE} -B installworld
  .if target(post-world)
         @echo


-- 
-Chuck