From cf763a57d2d4b6c2d6c631c2751f8875efd068ab Mon Sep 17 00:00:00 2001 From: John Birrell Date: Sun, 11 Jan 1998 04:51:02 +0000 Subject: [PATCH] Test for ${MACHINE} == "alpha" and include the bootstrap makefile instead of doing the normal build. When the alpha bootstrap is complete (there is more work to do!), the alpha will build like the i386 does now. I changed i386 references to ${MACHINE} now that we're multi-architecture. --- Makefile | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index aa0fc345e9a..916cf53caa1 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,12 @@ # -# $Id: Makefile,v 1.154 1997/10/07 11:32:05 bde Exp $ +# $Id: Makefile,v 1.155 1997/10/10 13:02:36 asami Exp $ +# +# While porting to the Alpha architecture include the bootstrap instead +# of the normal build. +# +.if ${MACHINE} == "alpha" +.include "Makefile.alpha" +.else # # Make command line options: # -DCLOBBER will remove /usr/include @@ -484,7 +491,9 @@ includes: .else cd ${.CURDIR}/lib/libtelnet && ${MAKE} beforeinstall .endif - cd ${.CURDIR}/lib/csu/i386 && ${MAKE} beforeinstall +.if exists(${.CURDIR}/lib/csu/${MACHINE}) + cd ${.CURDIR}/lib/csu/${MACHINE} && ${MAKE} beforeinstall +.endif cd ${.CURDIR}/lib/libalias && ${MAKE} beforeinstall cd ${.CURDIR}/lib/libc && ${MAKE} beforeinstall cd ${.CURDIR}/lib/libcurses && ${MAKE} beforeinstall @@ -544,8 +553,8 @@ lib-tools: # libraries - build and install the libraries # libraries: -.if exists(lib/csu/i386) - cd ${.CURDIR}/lib/csu/i386 && ${MAKE} depend && \ +.if exists(lib/csu/${MACHINE}) + cd ${.CURDIR}/lib/csu/${MACHINE} && ${MAKE} depend && \ ${MAKE} ${MK_FLAGS} all && \ ${MAKE} ${MK_FLAGS} -B install ${CLEANDIR} ${OBJDIR} .endif @@ -684,4 +693,6 @@ ${entry}.${__target}__D: .PHONY par-${__target}: ${SUBDIR:S/$/.${__target}__D/} .endfor +.endif + .include