diff options
| author | jb <jb@FreeBSD.org> | 1998-08-31 20:48:13 +0000 |
|---|---|---|
| committer | jb <jb@FreeBSD.org> | 1998-08-31 20:48:13 +0000 |
| commit | c3fa37d604772f443b31aa7d26c331bd64c2675d (patch) | |
| tree | 16f5392ba1da9a33bd19eda3586c5c91b731a880 /Makefile.inc1 | |
| parent | 116f00b60270c05ddcc944f0393b6772d0c2d6c2 (diff) | |
| download | FreeBSD-src-c3fa37d604772f443b31aa7d26c331bd64c2675d.zip FreeBSD-src-c3fa37d604772f443b31aa7d26c331bd64c2675d.tar.gz | |
MACHINE -> MACHINE_ARCH to allow PC98 to define MACHINE=pc98.
Submitted by: Takahashi Yoshihiro <nyan@wyvern.cc.kogakuin.ac.jp>
Diffstat (limited to 'Makefile.inc1')
| -rw-r--r-- | Makefile.inc1 | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/Makefile.inc1 b/Makefile.inc1 index 2d04a86..86ab5c0 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -1,5 +1,5 @@ # -# $Id: Makefile,v 1.209 1998/08/04 17:13:38 bde Exp $ +# $Id: Makefile.inc1,v 1.1 1998/08/31 01:08:08 jb Exp $ # # Make command line options: # -DCLOBBER will remove /usr/include @@ -557,8 +557,8 @@ includes: .else cd ${.CURDIR}/lib/libtelnet; ${MAKE} beforeinstall .endif -.if exists(${.CURDIR}/lib/csu/${MACHINE}) - cd ${.CURDIR}/lib/csu/${MACHINE}; ${MAKE} beforeinstall +.if exists(${.CURDIR}/lib/csu/${MACHINE_ARCH}) + cd ${.CURDIR}/lib/csu/${MACHINE_ARCH}; ${MAKE} beforeinstall .endif cd ${.CURDIR}/lib/libalias; ${MAKE} beforeinstall cd ${.CURDIR}/lib/libc; ${MAKE} beforeinstall @@ -651,12 +651,12 @@ lib-tools: # Some libraries are built conditionally and/or are in inconsistently # named directories: # -.if exists(lib/csu/${MACHINE}.pcc) -_csu=lib/csu/${MACHINE}.pcc -.elif ${MACHINE} == "i386" && ${OBJFORMAT} == "elf" +.if exists(lib/csu/${MACHINE_ARCH}.pcc) +_csu=lib/csu/${MACHINE_ARCH}.pcc +.elif ${MACHINE_ARCH} == "i386" && ${OBJFORMAT} == "elf" _csu=lib/csu/i386-elf .else -_csu=lib/csu/${MACHINE} +_csu=lib/csu/${MACHINE_ARCH} .endif .if !defined(NOSECURE) && !defined(NOCRYPT) @@ -944,9 +944,9 @@ legacy-install: .for __target in clean cleandepend cleandir depend obj .for entry in ${SUBDIR} ${entry}.${__target}__D: .PHONY - @if test -d ${.CURDIR}/${entry}.${MACHINE}; then \ - ${ECHODIR} "===> ${DIRPRFX}${entry}.${MACHINE}"; \ - edir=${entry}.${MACHINE}; \ + @if test -d ${.CURDIR}/${entry}.${MACHINE_ARCH}; then \ + ${ECHODIR} "===> ${DIRPRFX}${entry}.${MACHINE_ARCH}"; \ + edir=${entry}.${MACHINE_ARCH}; \ cd ${.CURDIR}/$${edir}; \ else \ ${ECHODIR} "===> ${DIRPRFX}${entry}"; \ |
