Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. =================================================================== RCS file: /ftp/cvs/cvsroot/src/Makefile,v rcsdiff: /ftp/cvs/cvsroot/src/Makefile,v: warning: Unknown phrases like `commitid ...;' are present. retrieving revision 1.50 retrieving revision 1.74 diff -u -p -r1.50 -r1.74 --- src/Makefile 1998/02/20 01:39:38 1.50 +++ src/Makefile 1998/12/07 01:42:34 1.74 @@ -1,18 +1,20 @@ -# $NetBSD: Makefile,v 1.50 1998/02/20 01:39:38 mellon Exp $ +# $NetBSD: Makefile,v 1.74 1998/12/07 01:42:34 simonb Exp $ .include # for configuration variables. +HAVE_GCC28!= ${CXX} --version | egrep "^(2\.8|egcs)" ; echo + # NOTE THAT etc *DOES NOT* BELONG IN THE LIST BELOW -SUBDIR+= lib include bin libexec sbin usr.bin usr.sbin share +SUBDIR+= lib include bin libexec sbin usr.bin usr.sbin share sys .if exists(games) SUBDIR+= games .endif SUBDIR+= gnu - -SUBDIR+= sys +# This is needed for libstdc++ and gen-params. +includes-gnu: includes-include includes-sys .if exists(domestic) && !defined(EXPORTABLE_SYSTEM) SUBDIR+= domestic @@ -40,55 +42,61 @@ beforeinstall: .endif afterinstall: -.ifndef NOMAN +.if !defined(NOMAN) && !defined(NOSHARE) (cd ${.CURDIR}/share/man && ${MAKE} makedb) .endif build: beforeinstall +.if !defined(NOSHARE) (cd ${.CURDIR}/share/mk && ${MAKE} install) (cd ${.CURDIR}/share/tmac && ${MAKE} && ${MAKE} install) -.if exists(domestic) && !defined (EXPORTABLE_SYSTEM) -.if exists(domestic/usr.bin/compile_et) - (cd ${.CURDIR}/domestic/usr.bin/compile_et && \ - ${MAKE} depend && ${MAKE} && \ - ${MAKE} install) -.endif -.if exists(domestic/usr.bin/make_cmds) - (cd ${.CURDIR}/domestic/usr.bin/make_cmds && \ - ${MAKE} depend && ${MAKE} && \ - ${MAKE} install) -.endif .endif - ${MAKE} includes .if !defined(UPDATE) ${MAKE} cleandir .endif - (cd ${.CURDIR}/lib/csu && ${MAKE} depend && ${MAKE} && ${MAKE} install) - (cd ${.CURDIR}/lib && ${MAKE} depend && ${MAKE} && ${MAKE} install) - (cd ${.CURDIR}/gnu/lib && ${MAKE} depend && ${MAKE} && ${MAKE} install) - (cd ${.CURDIR}/usr.bin/lex &&\ - ${MAKE} depend && ${MAKE} && ${MAKE} install) - (cd ${.CURDIR}/usr.bin/yacc && \ - ${MAKE} depend && ${MAKE} && ${MAKE} install) - (cd ${.CURDIR}/usr.bin/xlint && \ - ${MAKE} depend && ${MAKE} && ${MAKE} install) +.if defined(USE_EGCS) && empty(HAVE_GCC28) +.if defined(DESTDIR) + @echo "*** CAPUTE!" + @echo " You attempted to compile the world with egcs. You must" + @echo " first install a native egcs compiler." + false +.else + (cd ${.CURDIR}/gnu/usr.bin/egcs && \ + ${MAKE} depend && ${MAKE} NOMAN= && ${MAKE} NOMAN= install && \ + ${MAKE} cleandir) +.endif +.endif + ${MAKE} includes + (cd ${.CURDIR}/lib/csu && \ + ${MAKE} depend && ${MAKE} NOMAN= && ${MAKE} NOMAN= install) + (cd ${.CURDIR}/lib && \ + ${MAKE} depend && ${MAKE} NOMAN= && ${MAKE} NOMAN= install) + (cd ${.CURDIR}/gnu/lib && \ + ${MAKE} depend && ${MAKE} NOMAN= && ${MAKE} NOMAN= install) +.if !defined(USE_EGCS) +.if (${MACHINE_ARCH} != "alpha") && \ + (${MACHINE_ARCH} != "powerpc") + (cd ${.CURDIR}/gnu/usr.bin/gcc/libgcc && \ + ${MAKE} depend && ${MAKE} NOMAN= && ${MAKE} NOMAN= install) +.endif +.endif .if exists(domestic) && !defined(EXPORTABLE_SYSTEM) # libtelnet depends on libdes and libkrb. libkrb depends on # libcom_err. .if exists(domestic/lib/libdes) (cd ${.CURDIR}/domestic/lib/libdes && \ - ${MAKE} depend && ${MAKE} && ${MAKE} install) + ${MAKE} depend && ${MAKE} NOMAN= && ${MAKE} NOMAN= install) .endif .if exists(domestic/lib/libcom_err) (cd ${.CURDIR}/domestic/lib/libcom_err && \ - ${MAKE} depend && ${MAKE} && ${MAKE} install) + ${MAKE} depend && ${MAKE} NOMAN= && ${MAKE} NOMAN= install) .endif .if exists(domestic/lib/libkrb) (cd ${.CURDIR}/domestic/lib/libkrb && \ - ${MAKE} depend && ${MAKE} && ${MAKE} install) + ${MAKE} depend && ${MAKE} NOMAN= && ${MAKE} NOMAN= install) .endif - (cd ${.CURDIR}/domestic/lib/ && ${MAKE} depend && ${MAKE} && \ - ${MAKE} install) + (cd ${.CURDIR}/domestic/lib && \ + ${MAKE} depend && ${MAKE} NOMAN= && ${MAKE} NOMAN= install) .endif ${MAKE} depend && ${MAKE} && ${MAKE} install @echo -n "Build finished at: "