*** old/make/Makefile	Sun Jan 15 23:18:28 2012
--- new/make/Makefile	Sun Jan 15 23:18:25 2012

*** 1,7 ****
--- 1,7 ----
  #
! # 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
  # under the terms of the GNU General Public License version 2 only, as
  # published by the Free Software Foundation.  Oracle designates this

*** 27,36 ****
--- 27,37 ----
  # Makefile for building and packaging all of the JDK and the JRE. See
  # also included files.
  #
  
  BUILDDIR=.
+ 
  include $(BUILDDIR)/common/Defs.gmk
  
  #
  # Make sure we are clear what the default target is
  #

*** 258,267 ****
--- 259,271 ----
  
  #
  # Release engineering targets.
  #
  include $(BUILDDIR)/common/Release.gmk
+ ifeq ($(HAS_CUSTOM_MAKE),1)
+   include $(CUSTOM_MAKE_DIR)/Release.gmk
+ endif
  
  #
  # Cscope targets.
  #
  include $(BUILDDIR)/common/Cscope.gmk