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

Comparing trunk/Makefile.inc1 (file contents):
Revision 3446 by laffer1, Sat Aug 14 21:17:41 2010 UTC vs.
Revision 3495 by laffer1, Wed Sep 8 21:34:36 2010 UTC

# Line 1 | Line 1
1   #
2   # $FreeBSD: src/Makefile.inc1,v 1.499.2.7 2006/01/07 19:40:08 netchild Exp $
3 < # $MidnightBSD: src/Makefile.inc1,v 1.25 2009/11/28 22:44:29 laffer1 Exp $
3 > # $MidnightBSD: src/Makefile.inc1,v 1.26 2010/08/14 21:17:41 laffer1 Exp $
4   #
5   # Make command line options:
6   #       -DNO_CLEANDIR run ${MAKE} clean, instead of ${MAKE} cleandir
# Line 151 | Line 151 | BUILD_ARCH!=   uname -p
151   .error To cross-build, set TARGET_ARCH.
152   .endif
153   .endif
154 < .if ${MACHINE} == ${TARGET} && !defined(CROSS_BUILD_TESTING)
154 > .if ${MACHINE} == ${TARGET} && ${MACHINE_ARCH} == ${TARGET_ARCH} && !defined(CROSS_BUILD_TESTING)
155   OBJTREE=        ${MAKEOBJDIRPREFIX}
156   .else
157 < OBJTREE=        ${MAKEOBJDIRPREFIX}/${TARGET}
157 > OBJTREE=        ${MAKEOBJDIRPREFIX}/${TARGET}.${TARGET_ARCH}
158   .endif
159   WORLDTMP=       ${OBJTREE}${.CURDIR}/tmp
160   # /usr/games added for fortune which depend on strfile

Comparing trunk/Makefile.inc1 (property cvs2svn:cvs-rev):
Revision 3446 by laffer1, Sat Aug 14 21:17:41 2010 UTC vs.
Revision 3495 by laffer1, Wed Sep 8 21:34:36 2010 UTC

# Line 1 | Line 1
1 < 1.26
1 > 1.27

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines