diff -r ffe6bce5a521 -r 5262b00bc10c Makefile --- a/Makefile Wed Jul 05 18:22:17 2017 +0200 +++ b/Makefile Tue Sep 18 11:29:16 2012 -0700 @@ -1,5 +1,5 @@ # -# Copyright (c) 1995, 2011, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 1995, 2012, Oracle and/or its affiliates. All rights reserved. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # # This code is free software; you can redistribute it and/or modify it @@ -23,6 +23,16 @@ # questions. # +# If NEWBUILD is defined, use the new build-infra Makefiles and configure. +# See NewMakefile.gmk for more information. + +ifeq ($(NEWBUILD),true) + + # The new top level Makefile + include NewMakefile.gmk + +else # Original Makefile logic + BUILD_PARENT_DIRECTORY=. # Basename of any originally supplied ALT_OUTPUTDIR directory @@ -557,3 +567,5 @@ # Force target FRC: +endif # Original Makefile logic +