make/CopySamples.gmk

*** 1,7 ****
  #
! # Copyright (c) 2011, 2013, 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
--- 1,7 ----
  #
! # Copyright (c) 2011, 2014, 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
*** 26,36 ****
  default: all
  
  include $(SPEC)
  include MakeBase.gmk
  
! SAMPLE_TARGET_DIR := $(JDK_OUTPUTDIR)/sample
  SAMPLE_SOURCE_DIR := $(JDK_TOPDIR)/src/sample/share
  SAMPLE_CLOSED_SOURCE_DIR := $(JDK_TOPDIR)/src/closed/sample/share
  SAMPLE_SOLARIS_SOURCE_DIR := $(JDK_TOPDIR)/src/sample/solaris
  
  # Exclude the vm directory
--- 26,36 ----
  default: all
  
  include $(SPEC)
  include MakeBase.gmk
  
! SAMPLE_TARGET_DIR := $(SUPPORT_OUTPUTDIR)/sample
  SAMPLE_SOURCE_DIR := $(JDK_TOPDIR)/src/sample/share
  SAMPLE_CLOSED_SOURCE_DIR := $(JDK_TOPDIR)/src/closed/sample/share
  SAMPLE_SOLARIS_SOURCE_DIR := $(JDK_TOPDIR)/src/sample/solaris
  
  # Exclude the vm directory