svn commit: r293699 - stable/10

Bryan Drewery bdrewery at FreeBSD.org
Mon Jan 11 20:55:53 UTC 2016


Author: bdrewery
Date: Mon Jan 11 20:55:52 2016
New Revision: 293699
URL: https://svnweb.freebsd.org/changeset/base/293699

Log:
  MFC r293440:
  
    Fix upgrading from OSVERSION 1000002-1000032 after r288829.

Modified:
  stable/10/Makefile.inc1
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/Makefile.inc1
==============================================================================
--- stable/10/Makefile.inc1	Mon Jan 11 20:38:39 2016	(r293698)
+++ stable/10/Makefile.inc1	Mon Jan 11 20:55:52 2016	(r293699)
@@ -1284,8 +1284,11 @@ _mklocale=	usr.bin/mklocale
 _sed=		usr.bin/sed
 .endif
 
-.if ${BOOTSTRAPPING} < 1000002
+.if ${BOOTSTRAPPING} < 1000033
 _m4=		usr.bin/m4
+_lex=		usr.bin/lex
+
+${_bt}-usr.bin/lex: ${_bt}-usr.bin/m4
 .endif
 
 .if ${BOOTSTRAPPING} < 1001506
@@ -1314,12 +1317,6 @@ ${_bt}-usr.sbin/nmtree: ${_bt}-lib/libne
 _cat=		bin/cat
 .endif
 
-.if ${BOOTSTRAPPING} < 1000033
-_lex=		usr.bin/lex
-
-${_bt}-usr.bin/lex: ${_bt}-usr.bin/m4
-.endif
-
 .if ${BOOTSTRAPPING} >= 900040 && ${BOOTSTRAPPING} < 900041
 _awk=		usr.bin/awk
 .endif


More information about the svn-src-all mailing list