d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

MACHINE -> MACHINE_ARCH to allow PC98 to define MACHINE=pc98.

Browse Source 
Submitted by: Takahashi Yoshihiro <nyan@wyvern.cc.kogakuin.ac.jp>
This commit is contained in:
John Birrell 1998-08-31 20:48:13 +00:00
parent f3c6146d5e
commit f471c44869
3 changed files with 25 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
Makefile.inc1
View File

@ -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}"; \

10
etc/Makefile
View File

@ -1,5 +1,5 @@
# from: @(#)Makefile 5.11 (Berkeley) 5/21/91
# $Id: Makefile,v 1.168 1998/08/04 15:54:27 peter Exp $
# $Id: Makefile,v 1.169 1998/08/07 08:24:07 jb Exp $
SUBDIR= sendmail
@ -11,9 +11,9 @@ BIN1= aliases amd.map crontab csh.cshrc csh.login csh.logout dm.conf \
inetd.conf login.conf login.access motd modems networks \
newsyslog.conf phones pccard.conf.sample printcap profile protocols \
rc rc.conf rc.firewall rc.local rc.network rc.pccard rc.serial \
rc.shutdown etc.${MACHINE}/rc.${MACHINE} \
remote security services shells \
syslog.conf etc.${MACHINE}/ttys etc.${MACHINE}/disktab rpc make.conf \
rc.shutdown etc.${MACHINE_ARCH}/rc.${MACHINE_ARCH} \
remote security services shells syslog.conf \
etc.${MACHINE_ARCH}/ttys etc.${MACHINE_ARCH}/disktab rpc make.conf \
${.CURDIR}/../gnu/usr.bin/man/manpath/manpath.config \
${.CURDIR}/../usr.bin/mail/misc/mail.rc \
${.CURDIR}/../usr.bin/locate/locate/locate.rc
@ -62,7 +62,7 @@ distribution:
( cd ${.CURDIR}/../sys/i386/boot/biosboot; ${MAKE} install-boothelp ); \
pwd_mkdb -p -d ${DESTDIR}/etc ${DESTDIR}/etc/master.passwd; \
${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 555 \
MAKEDEV.local etc.${MACHINE}/MAKEDEV ${DESTDIR}/dev )
MAKEDEV.local etc.${MACHINE_ARCH}/MAKEDEV ${DESTDIR}/dev )
(cd ${DESTDIR}/dev; sh MAKEDEV all) ;
(cd ${.CURDIR}/root; \
${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 644 dot.cshrc \

20
gnu/usr.bin/as/Makefile
View File

@ -1,13 +1,13 @@
# from: @(#)Makefile 6.1 (Berkeley) 3/3/91
# $Id: Makefile,v 1.13 1998/03/06 13:13:15 bde Exp $
# $Id: Makefile,v 1.14 1998/05/25 17:34:36 sos Exp $
.include "config/Makefile.$(MACHINE)"
.include "config/Makefile.$(MACHINE_ARCH)"
.if !defined (gas_hosttype)
gas_hosttype=$(MACHINE)
gas_hosttype=$(MACHINE_ARCH)
.endif
.if !defined (gas_target)
gas_target=$(MACHINE)
gas_target=$(MACHINE_ARCH)
.endif
.if !defined (gas_objformat)
gas_objformat=aout
@ -33,12 +33,12 @@ CONF_HEADERS= targ-cpu.h obj-format.h host.h targ-env.h
SUBDIR+= doc
targ-cpu.h: Makefile config/Makefile.$(MACHINE) $(.CURDIR)/config/tc-$(gas_target).h
targ-cpu.h: Makefile config/Makefile.$(MACHINE_ARCH) $(.CURDIR)/config/tc-$(gas_target).h
@cmp -s $(.CURDIR)/config/tc-$(gas_target).h targ-cpu.h || \
( ${ECHO} "updating ${.TARGET}..." ; /bin/rm -f targ-cpu.h ; \
cp $(.CURDIR)/config/tc-$(gas_target).h targ-cpu.h )
obj-format.h: Makefile config/Makefile.$(MACHINE) $(.CURDIR)/config/obj-$(gas_objformat).h
obj-format.h: Makefile config/Makefile.$(MACHINE_ARCH) $(.CURDIR)/config/obj-$(gas_objformat).h
@cmp -s $(.CURDIR)/config/obj-$(gas_objformat).h obj-format.h || \
( ${ECHO} "updating ${.TARGET}..." ; /bin/rm -f obj-format.h ; \
cp $(.CURDIR)/config/obj-$(gas_objformat).h obj-format.h )
@ -49,18 +49,18 @@ config_hostfile= $(.CURDIR)/config/ho-$(gas_hosttype).h
config_hostfile= $(.CURDIR)/config/ho-generic.h
.endif
host.h: Makefile config/Makefile.$(MACHINE) $(config_hostfile)
host.h: Makefile config/Makefile.$(MACHINE_ARCH) $(config_hostfile)
@cmp -s $(config_hostfile) host.h || \
( ${ECHO} "updating ${.TARGET}..." ; /bin/rm -f host.h ; \
cp $(config_hostfile) host.h )
.if exists ($(.CURDIR)/config/te-$(MACHINE).h)
config_targenvfile= $(.CURDIR)/config/te-$(MACHINE).h
.if exists ($(.CURDIR)/config/te-$(MACHINE_ARCH).h)
config_targenvfile= $(.CURDIR)/config/te-$(MACHINE_ARCH).h
.else
config_targenvfile= $(.CURDIR)/config/te-generic.h
.endif
targ-env.h: Makefile config/Makefile.$(MACHINE) $(config_targenvfile)
targ-env.h: Makefile config/Makefile.$(MACHINE_ARCH) $(config_targenvfile)
@cmp -s $(config_targenvfile) targ-env.h || \
( ${ECHO} "updating ${.TARGET}..." ; /bin/rm -f targ-env.h ; \
cp $(config_targenvfile) targ-env.h )