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.58 retrieving revision 1.70 diff -u -p -r1.58 -r1.70 --- src/Makefile 1998/07/24 16:48:47 1.58 +++ src/Makefile 1998/10/15 02:50:00 1.70 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.58 1998/07/24 16:48:47 tv Exp $ +# $NetBSD: Makefile,v 1.70 1998/10/15 02:50:00 mycroft Exp $ .include # for configuration variables. @@ -42,52 +42,67 @@ 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 ${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}/gnu/usr.bin/gcc/libgcc && ${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) && !empty(HAVE_GCC28) + (cd ${.CURDIR}/gnu/lib/libgcc && \ + ${MAKE} depend && NOMAN= ${MAKE} && NOMAN= ${MAKE} install) +.else +.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 && NOMAN= ${MAKE} && NOMAN= ${MAKE} install) .endif - (cd ${.CURDIR}/domestic/lib/ && ${MAKE} depend && ${MAKE} && \ - ${MAKE} install) +.if !defined(DESTDIR) + ldconfig -m /usr/lib .endif ${MAKE} depend && ${MAKE} && ${MAKE} install .if defined(USE_EGCS) -.if defined(DESTDIR) -.if (${HAVE_GCC28} == "") - @echo '***** WARNING ***** Your system compiler is not GCC 2.8 or higher,' +.if defined(DESTDIR) && (${HAVE_GCC28} == "") + @echo '***** WARNING ***** Your system compiler is not GCC 2.8 or higher' @echo 'and you have built a distribution with GCC 2.8 and DESTDIR set.' @echo 'You will need to rebuild libgcc from gnu/usr.bin/egcs/libgcc' @echo 'in order to have full C++ support in the binary set.' -.endif # HAVE_GCC28 .else - (cd ${.CURDIR}/gnu/usr.bin/egcs/libgcc &&\ + (cd ${.CURDIR}/gnu/lib/libgcc &&\ ${MAKE} depend && ${MAKE} && ${MAKE} install) -.endif # DESTDIR +.endif # DESTDIR && !HAVE_GCC28 .endif # USE_EGCS @echo -n "Build finished at: " @date