[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.312 and 1.315

version 1.312, 2015/01/07 20:42:01 version 1.315, 2015/06/27 16:21:07
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 481  do-x11: .PHONY .MAKE
Line 485  do-x11: .PHONY .MAKE
 .if ${X11FLAVOUR} == "Xorg"  .if ${X11FLAVOUR} == "Xorg"
         ${MAKEDIRTARGET} external/mit/xorg/tools all          ${MAKEDIRTARGET} external/mit/xorg/tools all
         ${MAKEDIRTARGET} external/mit/xorg/lib build_install          ${MAKEDIRTARGET} external/mit/xorg/lib build_install
   .if ${MKCOMPATX11} != "no"
           ${MAKEDIRTARGET} compat build_install BOOTSTRAP_SUBDIRS="../../../external/mit/xorg/lib"
   .endif
 .else  .else
         ${MAKEDIRTARGET} x11 build          ${MAKEDIRTARGET} x11 build
 .endif  .endif

Legend:
Removed from v.1.312  
changed lines
  Added in v.1.315

CVSweb <webmaster@jp.NetBSD.org>