[BACK]Return to Makefile CVS log [TXT][DIR] Up to [cvs.NetBSD.org] / src

Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.

Diff for /src/Makefile between version 1.310 and 1.313

version 1.310, 2014/08/18 07:52:40 version 1.313, 2015/05/03 15:13:13
Line 64 
Line 64 
 #       Populate ${RELEASEDIR}/${RELEASEMACHINEDIR}/binary/syspkgs  #       Populate ${RELEASEDIR}/${RELEASEMACHINEDIR}/binary/syspkgs
 #       from ${DESTDIR}  #       from ${DESTDIR}
 #   iso-image:  #   iso-image:
 #       Create CD-ROM image in RELEASEDIR/iso.  #       Create CD-ROM image in RELEASEDIR/images.
 #       RELEASEDIR must already have been populated by `make release'  #       RELEASEDIR must already have been populated by `make release'
 #       or equivalent.  #       or equivalent.
 #   iso-image-source:  #   iso-image-source:
 #       Create CD-ROM image with source in RELEASEDIR/iso.  #       Create CD-ROM image with source in RELEASEDIR/images.
 #       RELEASEDIR must already have been populated by  #       RELEASEDIR must already have been populated by
 #       `make release sourcesets' or equivalent.  #       `make release sourcesets' or equivalent.
 #   live-image:  #   live-image:
Line 181  _POSTINSTALL_ENV= \
Line 181  _POSTINSTALL_ENV= \
         SED=${TOOL_SED:Q}               \          SED=${TOOL_SED:Q}               \
         STAT=${TOOL_STAT:Q}          STAT=${TOOL_STAT:Q}
   
   .if ${MKX11} != "no"
   _POSTINSTALL_X11=-x ${X11SRCDIR:Q}
   .endif
   
 postinstall-check: .PHONY  postinstall-check: .PHONY
         @echo "   === Post installation checks ==="          @echo "   === Post installation checks ==="
         ${_POSTINSTALL_ENV} ${HOST_SH} ${_POSTINSTALL} -s ${.CURDIR} -d ${DESTDIR}/ check; if [ $$? -gt 1 ]; then exit 1; fi          ${_POSTINSTALL_ENV} ${HOST_SH} ${_POSTINSTALL} -s ${.CURDIR} ${_POSTINSTALL_X11} -d ${DESTDIR}/ check; if [ $$? -gt 1 ]; then exit 1; fi
         @echo "   ================================"          @echo "   ================================"
   
 postinstall-fix: .NOTMAIN .PHONY  postinstall-fix: .NOTMAIN .PHONY
         @echo "   === Post installation fixes ==="          @echo "   === Post installation fixes ==="
         ${_POSTINSTALL_ENV} ${HOST_SH} ${_POSTINSTALL} -s ${.CURDIR} -d ${DESTDIR}/ fix          ${_POSTINSTALL_ENV} ${HOST_SH} ${_POSTINSTALL} -s ${.CURDIR} ${_POSTINSTALL_X11} -d ${DESTDIR}/ fix
         @echo "   ==============================="          @echo "   ==============================="
   
 postinstall-fix-obsolete: .NOTMAIN .PHONY  postinstall-fix-obsolete: .NOTMAIN .PHONY
         @echo "   === Removing obsolete files ==="          @echo "   === Removing obsolete files ==="
         ${_POSTINSTALL_ENV} ${HOST_SH} ${_POSTINSTALL} -s ${.CURDIR} -d ${DESTDIR}/ fix obsolete          ${_POSTINSTALL_ENV} ${HOST_SH} ${_POSTINSTALL} -s ${.CURDIR} ${_POSTINSTALL_X11} -d ${DESTDIR}/ fix obsolete
         @echo "   ==============================="          @echo "   ==============================="
   
 postinstall-fix-obsolete_stand: .NOTMAIN .PHONY  postinstall-fix-obsolete_stand: .NOTMAIN .PHONY
         @echo "   === Removing obsolete files ==="          @echo "   === Removing obsolete files ==="
         ${_POSTINSTALL_ENV} ${HOST_SH} ${_POSTINSTALL} -s ${.CURDIR} -d ${DESTDIR}/ fix obsolete_stand          ${_POSTINSTALL_ENV} ${HOST_SH} ${_POSTINSTALL} -s ${.CURDIR} ${_POSTINSTALL_X11} -d ${DESTDIR}/ fix obsolete_stand
         @echo "   ==============================="          @echo "   ==============================="
   
   
Line 231  BUILDTARGETS+= includes
Line 235  BUILDTARGETS+= includes
 .endif  .endif
 BUILDTARGETS+=  do-lib  BUILDTARGETS+=  do-lib
 BUILDTARGETS+=  do-compat-lib  BUILDTARGETS+=  do-compat-lib
 BUILDTARGETS+=  do-build  
 .if ${MKX11} != "no"  .if ${MKX11} != "no"
 BUILDTARGETS+=  do-x11  BUILDTARGETS+=  do-x11
 .endif  .endif
   BUILDTARGETS+=  do-build
 .if ${MKEXTSRC} != "no"  .if ${MKEXTSRC} != "no"
 BUILDTARGETS+=  do-extsrc  BUILDTARGETS+=  do-extsrc
 .endif  .endif
Line 479  do-build: .PHONY .MAKE
Line 483  do-build: .PHONY .MAKE
 do-x11: .PHONY .MAKE  do-x11: .PHONY .MAKE
 .if ${MKX11} != "no"  .if ${MKX11} != "no"
 .if ${X11FLAVOUR} == "Xorg"  .if ${X11FLAVOUR} == "Xorg"
         ${MAKEDIRTARGET} external/mit/xorg build          ${MAKEDIRTARGET} external/mit/xorg/tools all
           ${MAKEDIRTARGET} external/mit/xorg/lib build_install
 .else  .else
         ${MAKEDIRTARGET} x11 build          ${MAKEDIRTARGET} x11 build
 .endif  .endif

Legend:
Removed from v.1.310  
changed lines
  Added in v.1.313

CVSweb <webmaster@jp.NetBSD.org>