[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.315 and 1.316

version 1.315, 2015/06/27 16:21:07 version 1.316, 2015/07/23 08:03:25
Line 98 
Line 98 
 #                    if ${MKCOMPAT} != "no".  #                    if ${MKCOMPAT} != "no".
 #   do-build:        builds and installs the entire system.  #   do-build:        builds and installs the entire system.
 #   do-x11:          builds and installs X11 if ${MKX11} != "no"; either  #   do-x11:          builds and installs X11 if ${MKX11} != "no"; either
 #                    X11R7 from src/external/mit/xorg if ${X11FLAVOUR} == "Xorg"  #                    X11R7 from src/external/mit/xorg
 #                    or X11R6 from src/x11  
 #   do-extsrc:       builds and installs extsrc if ${MKEXTSRC} != "no".  #   do-extsrc:       builds and installs extsrc if ${MKEXTSRC} != "no".
 #   do-obsolete:     installs the obsolete sets (for the postinstall-* targets).  #   do-obsolete:     installs the obsolete sets (for the postinstall-* targets).
 #  #
Line 482  do-build: .PHONY .MAKE
Line 481  do-build: .PHONY .MAKE
   
 do-x11: .PHONY .MAKE  do-x11: .PHONY .MAKE
 .if ${MKX11} != "no"  .if ${MKX11} != "no"
 .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"  .if ${MKCOMPATX11} != "no"
         ${MAKEDIRTARGET} compat build_install BOOTSTRAP_SUBDIRS="../../../external/mit/xorg/lib"          ${MAKEDIRTARGET} compat build_install BOOTSTRAP_SUBDIRS="../../../external/mit/xorg/lib"
 .endif  .endif
 .else  .else
         ${MAKEDIRTARGET} x11 build  
 .endif  
 .else  
         @echo "MKX11 is not enabled"          @echo "MKX11 is not enabled"
         @false          @false
 .endif  .endif

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

CVSweb <webmaster@jp.NetBSD.org>