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.56 retrieving revision 1.71 diff -u -p -r1.56 -r1.71 --- src/Makefile 1998/05/27 06:38:37 1.56 +++ src/Makefile 1998/10/16 05:05:09 1.71 @@ -1,7 +1,9 @@ -# $NetBSD: Makefile,v 1.56 1998/05/27 06:38:37 scottr Exp $ +# $NetBSD: Makefile,v 1.71 1998/10/16 05:05:09 mycroft 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 sys @@ -40,60 +42,66 @@ 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) +.endif .if !defined(UPDATE) ${MAKE} cleandir .endif +.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 && NOMAN= ${MAKE} && NOMAN= ${MAKE} install && \ + ${MAKE} cleandir) +.endif +.endif ${MAKE} includes - (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) + (cd ${.CURDIR}/lib/csu && \ + ${MAKE} depend && NOMAN= ${MAKE} && NOMAN= ${MAKE} install) + (cd ${.CURDIR}/lib && \ + ${MAKE} depend && NOMAN= ${MAKE} && NOMAN= ${MAKE} install) + (cd ${.CURDIR}/gnu/lib && \ + ${MAKE} depend && NOMAN= ${MAKE} && NOMAN= ${MAKE} install) +.if !defined(USE_EGCS) +.if (${MACHINE_ARCH} != "alpha") && \ + (${MACHINE_ARCH} != "powerpc") + (cd ${.CURDIR}/gnu/usr.bin/gcc/libgcc && \ + ${MAKE} depend && NOMAN= ${MAKE} && NOMAN= ${MAKE} 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 && NOMAN= ${MAKE} && NOMAN= ${MAKE} install) .endif .if exists(domestic/lib/libcom_err) (cd ${.CURDIR}/domestic/lib/libcom_err && \ - ${MAKE} depend && ${MAKE} && ${MAKE} install) + ${MAKE} depend && NOMAN= ${MAKE} && NOMAN= ${MAKE} install) .endif .if exists(domestic/lib/libkrb) (cd ${.CURDIR}/domestic/lib/libkrb && \ - ${MAKE} depend && ${MAKE} && ${MAKE} install) + ${MAKE} depend && NOMAN= ${MAKE} && NOMAN= ${MAKE} install) .endif - (cd ${.CURDIR}/domestic/lib/ && ${MAKE} depend && ${MAKE} && \ - ${MAKE} install) + (cd ${.CURDIR}/domestic/lib && \ + ${MAKE} depend && NOMAN= ${MAKE} && NOMAN= ${MAKE} install) +.endif +.if !defined(DESTDIR) + ldconfig -m /usr/lib .endif ${MAKE} depend && ${MAKE} && ${MAKE} install -.if (${MACHINE_ARCH} == "arm32") || \ - (${MACHINE_ARCH} == "i386") || \ - (${MACHINE_ARCH} == "mips") || \ - (${MACHINE_ARCH} == "m68k") || \ - (${MACHINE_ARCH} == "ns32k") || \ - (${MACHINE_ARCH} == "sparc") || \ - (${MACHINE_ARCH} == "vax") -.if defined(USE_EGCS) - (cd ${.CURDIR}/gnu/usr.bin/egcs/libgcc &&\ - ${MAKE} depend && ${MAKE} && ${MAKE} install) -.else - (cd ${.CURDIR}/gnu/usr.bin/gcc/libgcc &&\ - ${MAKE} depend && ${MAKE} && ${MAKE} install) -.endif # USE_EGCS -.endif # MACHINE_ARCH @echo -n "Build finished at: " @date