Merge

Tue, 22 Oct 2013 16:41:34 -0700

author
tbell
date
Tue, 22 Oct 2013 16:41:34 -0700
changeset 867
2cc1a52d37ef
parent 866
269497597620
parent 865
4293401d683b
child 868
6f19b2440412

Merge

     1.1 --- a/NewMakefile.gmk	Tue Oct 22 16:28:57 2013 -0700
     1.2 +++ b/NewMakefile.gmk	Tue Oct 22 16:41:34 2013 -0700
     1.3 @@ -1,5 +1,5 @@
     1.4  #
     1.5 -# Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
     1.6 +# Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
     1.7  # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
     1.8  #
     1.9  # This code is free software; you can redistribute it and/or modify it
    1.10 @@ -36,7 +36,7 @@
    1.11  TEST_FOR_NON_GNUMAKE:sh=echo You are not using GNU make/gmake, this is a requirement. Check your path. 1>&2 && exit 1
    1.12  
    1.13  # Assume we have GNU make, but check version.
    1.14 -ifeq ($(strip $(foreach v, 3.81 3.82 4.%, $(filter $v, $(MAKE_VERSION)))), )
    1.15 +ifeq ($(strip $(foreach v, 3.81% 3.82% 4.%, $(filter $v, $(MAKE_VERSION)))), )
    1.16    $(error This version of GNU Make is too low ($(MAKE_VERSION)). Check your path, or upgrade to 3.81 or newer.)
    1.17  endif
    1.18  

mercurial