make/Install.gmk

*** 1,7 ****
  #
! # Copyright (c) 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
--- 1,7 ----
  #
! # Copyright (c) 2014, 2015, 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: install
  
  include $(SPEC)
  
  BINARIES := $(notdir $(wildcard $(JDK_IMAGE_DIR)/bin/*))
! INSTALLDIR := openjdk-$(RELEASE)
  
  # Install the jdk image, in a very crude way. Not taking into
  # account, how to install properly on macosx or windows etc.
  install:
          echo Installing jdk image into $(INSTALL_PREFIX)/jvm/$(INSTALLDIR)
--- 26,36 ----
  default: install
  
  include $(SPEC)
  
  BINARIES := $(notdir $(wildcard $(JDK_IMAGE_DIR)/bin/*))
! INSTALLDIR := openjdk-$(VERSION_SHORT)
  
  # Install the jdk image, in a very crude way. Not taking into
  # account, how to install properly on macosx or windows etc.
  install:
          echo Installing jdk image into $(INSTALL_PREFIX)/jvm/$(INSTALLDIR)