ViewVC Help
View File | Revision Log | Show Annotations | Download File | View Changeset | Root Listing
root/src/trunk/Makefile
(Generate patch)

Comparing:
branches/MidnightBSD/Makefile (file contents), Revision 5 by laffer1, Sat Feb 25 02:38:42 2006 UTC vs.
trunk/Makefile (file contents), Revision 567 by laffer1, Sun Jan 7 23:54:06 2007 UTC

# Line 1 | Line 1
1   #
2   # $FreeBSD: src/Makefile,v 1.319.2.2 2006/01/07 19:40:08 netchild Exp $
3 + # $MidnightBSD: src/Makefile,v 1.5 2006/12/27 02:27:33 laffer1 Exp $
4   #
5   # The user-driven targets are:
6   #
# Line 20 | Line 21
21   # delete-old          - Delete obsolete files and directories interactively.
22   # delete-old-libs     - Delete obsolete libraries interactively.
23   #
24 < # This makefile is simple by design. The FreeBSD make automatically reads
24 > # This makefile is simple by design. The MidnightBSD make automatically reads
25   # the /usr/share/mk/sys.mk unless the -m argument is specified on the
26   # command line. By keeping this makefile simple, it doesn't matter too
27   # much how different the installed mk files are from those in the source
# Line 93 | Line 94 | TGTS+= ${BITGTS}
94   PATH=   /sbin:/bin:/usr/sbin:/usr/bin
95   MAKEOBJDIRPREFIX?=      /usr/obj
96   _MAKEOBJDIRPREFIX!= /usr/bin/env -i PATH=${PATH} ${MAKE} \
97 <    ${.MAKEFLAGS:MMAKEOBJDIRPREFIX=*} \
97 >    ${.MAKEFLAGS:MMAKEOBJDIRPREFIX=*}
98 > __MAKE_CONF=${_MAKE_CONF} \
99      -f /dev/null -V MAKEOBJDIRPREFIX dummy
100   .if !empty(_MAKEOBJDIRPREFIX)
101   .error MAKEOBJDIRPREFIX can only be set in environment, not as a global\
102 <        (in /etc/make.conf) or command-line variable.
102 >        (in make.conf(5)) or command-line variable.
103   .endif
104   MAKEPATH=       ${MAKEOBJDIRPREFIX}${.CURDIR}/make.${MACHINE}
105   BINMAKE= \
# Line 265 | Line 267 | universe_prologue:
267          @echo "--------------------------------------------------------------"
268          @echo ">>> make universe started on ${STARTTIME}"
269          @echo "--------------------------------------------------------------"
270 < .for target in i386 i386:pc98 sparc64 alpha ia64 amd64
270 > .for target in i386 i386:pc98 sparc64 ia64 amd64
271   .for arch in ${target:C/:.*$//}
272   .for mach in ${target:C/^.*://}
273   KERNCONFS!=     cd ${.CURDIR}/sys/${mach}/conf && \
274 <                find [A-Z]*[A-Z] -type f -maxdepth 0
274 >                find [A-Z]*[A-Z] -type f -maxdepth 0 \
275 >                ! -name DEFAULTS ! -name LINT
276   KERNCONFS:=     ${KERNCONFS:S/^NOTES$/LINT/}
277   universe: universe_${mach}
278   .ORDER: universe_prologue universe_${mach} universe_epilogue

Comparing:
branches/MidnightBSD/Makefile (property cvs2svn:cvs-rev), Revision 5 by laffer1, Sat Feb 25 02:38:42 2006 UTC vs.
trunk/Makefile (property cvs2svn:cvs-rev), Revision 567 by laffer1, Sun Jan 7 23:54:06 2007 UTC

# Line 1 | Line 1
1 < 1.1.1.2
1 > 1.6

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines