[BACK]Return to Makefile CVS log [TXT][DIR] Up to [local] / src

Diff for /src/Makefile between version 1.38 and 1.46

version 1.38, 1998/05/18 18:29:07 version 1.46, 1999/01/24 16:40:42
Line 17 
Line 17 
 # well as populate the /usr/obj properly with directories for the  # well as populate the /usr/obj properly with directories for the
 # objects.  # objects.
 #  #
 # 3) If you are reasonably sure that things will compile OK, use the  # 3) It is strongly recommended that you build and install a new kernel
   # before rebuilding your system. Some of the new programs may use new
   # functionality or depend on API changes that your old kernel doesn't have.
   #
   # 4) If you are reasonably sure that things will compile OK, use the
 # "make build" target supplied here. Good luck.  # "make build" target supplied here. Good luck.
 #  #
 # 4) If you want to setup a cross-build environment, there is a "cross-tools"  # 5) If you want to setup a cross-build environment, there is a "cross-tools"
 # target available which upon completion of "make TARGET=<target> cross-tools"  # target available which upon completion of "make TARGET=<target> cross-tools"
 # (where <target> is one of the names in the /sys/arch directory) will produce  # (where <target> is one of the names in the /sys/arch directory) will produce
 # a set of compilation tools along with the includes in the /usr/cross/<target>  # a set of compilation tools along with the includes in the /usr/cross/<target>
Line 57 
Line 61 
   
 beforeinstall:  beforeinstall:
 .ifndef DESTDIR  .ifndef DESTDIR
         (cd ${.CURDIR}/etc && ${MAKE} DESTDIR=/ distrib-dirs)          (cd ${.CURDIR}/etc && ${MAKE} DESTDIR= distrib-dirs)
 .else  .else
         (cd ${.CURDIR}/etc && ${MAKE} distrib-dirs)          (cd ${.CURDIR}/etc && ${MAKE} distrib-dirs)
 .endif  .endif
Line 72 
Line 76 
 .ifdef GLOBAL_AUTOCONF_CACHE  .ifdef GLOBAL_AUTOCONF_CACHE
         rm -f ${GLOBAL_AUTOCONF_CACHE}          rm -f ${GLOBAL_AUTOCONF_CACHE}
 .endif  .endif
         (cd ${.CURDIR}/share/mk && ${MAKE} install)          (cd ${.CURDIR}/share/mk && ${SUDO} ${MAKE} install)
         (cd ${.CURDIR}/include; ${MAKE} includes)          (cd ${.CURDIR}/include; ${SUDO} ${MAKE} includes)
         ${MAKE} cleandir          ${SUDO} ${MAKE} cleandir
         (cd ${.CURDIR}/lib && ${MAKE} depend && ${MAKE} && ${MAKE} install)          (cd ${.CURDIR}/lib && ${MAKE} depend && ${MAKE} && \
         (cd ${.CURDIR}/gnu/lib && ${MAKE} depend && ${MAKE} && ${MAKE} install)              ${SUDO} ${MAKE} install)
           (cd ${.CURDIR}/gnu/lib && ${MAKE} depend && ${MAKE} && \
               ${SUDO} ${MAKE} install)
 .if (${MACHINE_ARCH} == "mips")  .if (${MACHINE_ARCH} == "mips")
         ldconfig          ldconfig
 .endif  .endif
 .if (${KERBEROS} == "yes")  .if (${KERBEROS} == "yes")
         (cd ${.CURDIR}/kerberosIV && ${MAKE} build)          (cd ${.CURDIR}/kerberosIV && ${MAKE} SUDO=${SUDO} build)
 .endif  .endif
 .if (${MACHINE_ARCH} == "mips")  .if (${MACHINE_ARCH} == "mips")
         ldconfig          ldconfig
 .endif  .endif
         ${MAKE} depend && ${MAKE} && ${MAKE} install          ${MAKE} depend && ${MAKE} && ${SUDO} ${MAKE} install
   
 .if !defined(TARGET)  .if !defined(TARGET)
 cross-tools:  cross-tools:
Line 138 
Line 144 
             /bin/sh ${BSDSRCDIR}/gnu/usr.bin/binutils/configure \              /bin/sh ${BSDSRCDIR}/gnu/usr.bin/binutils/configure \
             --prefix ${CROSSDIR}/usr \              --prefix ${CROSSDIR}/usr \
             --target `cat ${CROSSDIR}/TARGET_CANON` && \              --target `cat ${CROSSDIR}/TARGET_CANON` && \
             ${MAKE} && ${MAKE} install)              ${MAKE} CFLAGS=${CFLAGS} && ${MAKE} DESTDIR=${CROSSDIR} install)
         ${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 755 \          ${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 755 \
             ${.CURDIR}/usr.bin/lorder/lorder.sh.gnm \              ${.CURDIR}/usr.bin/lorder/lorder.sh.gnm \
             ${CROSSDIR}/usr/bin/`cat ${CROSSDIR}/TARGET_CANON`-lorder              ${CROSSDIR}/usr/bin/`cat ${CROSSDIR}/TARGET_CANON`-lorder
Line 296 
Line 302 
         chmod ${BINMODE} ${CROSSDIR}/usr/bin/cpp          chmod ${BINMODE} ${CROSSDIR}/usr/bin/cpp
         chown ${BINOWN}.${BINGRP} ${CROSSDIR}/usr/bin/cpp          chown ${BINOWN}.${BINGRP} ${CROSSDIR}/usr/bin/cpp
   
   # XXX MAKEOBJDIR maybe should be obj.${TARGET} here, revisit later
 cross-lib:  cross-lib:
         -mkdir -p ${CROSSDIR}/usr/obj          -mkdir -p ${CROSSDIR}/usr/obj
         -mkdir -p ${CROSSDIR}/usr/lib          -mkdir -p ${CROSSDIR}/usr/lib
Line 309 
Line 316 
             for lib in csu libc; do \              for lib in csu libc; do \
                 (cd $$lib; \                  (cd $$lib; \
                     ${CROSSENV} MAKEOBJDIR=obj.${MACHINE}.${TARGET} \                      ${CROSSENV} MAKEOBJDIR=obj.${MACHINE}.${TARGET} \
                       ${MAKE} NOMAN= depend; \
                       ${CROSSENV} MAKEOBJDIR=obj.${MACHINE}.${TARGET} \
                     ${MAKE} NOMAN=; \                      ${MAKE} NOMAN=; \
                     DESTDIR=${CROSSDIR} MAKEOBJDIR=obj.${MACHINE}.${TARGET} \                      ${CROSSENV} MAKEOBJDIR=obj.${MACHINE}.${TARGET} \
                     ${MAKE} NOMAN= install); \                      DESTDIR=${CROSSDIR} ${MAKE} NOMAN= install); \
             done; \              done; \
               ${CROSSENV} MAKEOBJDIR=obj.${MACHINE}.${TARGET} \
               ${MAKE} NOMAN= depend; \
             ${CROSSENV} MAKEOBJDIR=obj.${MACHINE}.${TARGET} ${MAKE} NOMAN=; \              ${CROSSENV} MAKEOBJDIR=obj.${MACHINE}.${TARGET} ${MAKE} NOMAN=; \
             MAKEOBJDIR=obj.${MACHINE}.${TARGET} DESTDIR=${CROSSDIR} \              ${CROSSENV} MAKEOBJDIR=obj.${MACHINE}.${TARGET} \
             SKIPDIR=libocurses/PSD.doc ${MAKE} NOMAN= install)              DESTDIR=${CROSSDIR} SKIPDIR=libocurses/PSD.doc \
               ${MAKE} NOMAN= install)
           (cd kerberosIV; \
               BSDOBJDIR=${CROSSDIR}/usr/obj \
               BSDSRCDIR=${.CURDIR} MAKEOBJDIR=obj.${MACHINE}.${TARGET} \
               ${MAKE} obj; \
               for lib in acl krb kadm kafs kdb; do \
                   (cd $$lib; \
                       ${CROSSENV} MAKEOBJDIR=obj.${MACHINE}.${TARGET} \
                       ${MAKE} NOMAN= depend; \
                       ${CROSSENV} MAKEOBJDIR=obj.${MACHINE}.${TARGET} \
                       ${MAKE} NOMAN=; \
                       DESTDIR=${CROSSDIR} MAKEOBJDIR=obj.${MACHINE}.${TARGET} \
                       ${MAKE} NOMAN= install); \
               done)
         ln -sf ${CROSSDIR}/usr/lib \          ln -sf ${CROSSDIR}/usr/lib \
             ${CROSSDIR}/usr/`cat ${CROSSDIR}/TARGET_CANON`/lib              ${CROSSDIR}/usr/`cat ${CROSSDIR}/TARGET_CANON`/lib
   
Legend:
Removed from v.1.38  
changed lines
  Added in v.1.46