[BACK]Return to bsd.prog.mk CVS log [TXT][DIR] Up to [local] / src / share / mk

Diff for /src/share/mk/bsd.prog.mk between version 1.47 and 1.48

version 1.47, 2006/05/27 23:01:21 version 1.48, 2006/06/26 03:12:37
Line 17 
Line 17 
 CFLAGS+=        ${COPTS}  CFLAGS+=        ${COPTS}
 CXXFLAGS+=     ${CXXOPTS}  CXXFLAGS+=     ${CXXOPTS}
   
 .if (${ELF_TOOLCHAIN:L} == "yes")  .if ${ELF_TOOLCHAIN:L} == "yes"
 CRTBEGIN?=       ${DESTDIR}/usr/lib/crtbegin.o  CRTBEGIN?=       ${DESTDIR}/usr/lib/crtbegin.o
 CRTEND?=         ${DESTDIR}/usr/lib/crtend.o  CRTEND?=         ${DESTDIR}/usr/lib/crtend.o
 .endif  .endif
Line 63 
Line 63 
 LIBY?=          ${DESTDIR}/usr/lib/liby.a  LIBY?=          ${DESTDIR}/usr/lib/liby.a
 LIBZ?=          ${DESTDIR}/usr/lib/libz.a  LIBZ?=          ${DESTDIR}/usr/lib/libz.a
   
 .if (${MACHINE_ARCH} == "alpha" || ${MACHINE_ARCH} == "amd64" || \  .if ${MACHINE_ARCH} == "alpha" || ${MACHINE_ARCH} == "amd64" || \
      ${MACHINE_ARCH} == "i386")      ${MACHINE_ARCH} == "i386"
 LIBARCH?=       ${DESTDIR}/usr/lib/lib${MACHINE_ARCH}.a  LIBARCH?=       ${DESTDIR}/usr/lib/lib${MACHINE_ARCH}.a
 .else  .else
 LIBARCH?=  LIBARCH?=

Legend:
Removed from v.1.47  
changed lines
  Added in v.1.48