comparison make/Install.gmk @ 44870:f025861fefcd

Merge
author lana
date Thu, 27 Apr 2017 21:16:59 +0000
parents 98ce0879ab4c
children
comparison
equal deleted inserted replaced
0:33801e2f0d33 1:9220e5014806
1 # 1 #
2 # Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved. 2 # Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
3 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 3 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
4 # 4 #
5 # This code is free software; you can redistribute it and/or modify it 5 # This code is free software; you can redistribute it and/or modify it
6 # under the terms of the GNU General Public License version 2 only, as 6 # under the terms of the GNU General Public License version 2 only, as
7 # published by the Free Software Foundation. Oracle designates this 7 # published by the Free Software Foundation. Oracle designates this
26 default: install 26 default: install
27 27
28 include $(SPEC) 28 include $(SPEC)
29 29
30 BINARIES := $(notdir $(wildcard $(JDK_IMAGE_DIR)/bin/*)) 30 BINARIES := $(notdir $(wildcard $(JDK_IMAGE_DIR)/bin/*))
31 INSTALLDIR := openjdk-$(RELEASE) 31 INSTALLDIR := openjdk-$(VERSION_SHORT)
32 32
33 # Install the jdk image, in a very crude way. Not taking into 33 # Install the jdk image, in a very crude way. Not taking into
34 # account, how to install properly on macosx or windows etc. 34 # account, how to install properly on macosx or windows etc.
35 install: 35 install:
36 echo Installing jdk image into $(INSTALL_PREFIX)/jvm/$(INSTALLDIR) 36 echo Installing jdk image into $(INSTALL_PREFIX)/jvm/$(INSTALLDIR)