comparison make/hotspot_distro @ 1930:2d26b0046e0d

Merge.
author Thomas Wuerthinger <wuerthinger@ssw.jku.at>
date Tue, 30 Nov 2010 14:53:30 +0100
parents c18cbe5936b8
children 0a8e0d4345b3
comparison
equal deleted inserted replaced
1484:6b7001391c97 1930:2d26b0046e0d
1 # 1 #
2 # Copyright 2006-2008 Sun Microsystems, Inc. All Rights Reserved. 2 # Copyright (c) 2006, 2008, 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. 7 # published by the Free Software Foundation.
14 # 14 #
15 # You should have received a copy of the GNU General Public License version 15 # You should have received a copy of the GNU General Public License version
16 # 2 along with this work; if not, write to the Free Software Foundation, 16 # 2 along with this work; if not, write to the Free Software Foundation,
17 # Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. 17 # Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
18 # 18 #
19 # Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, 19 # Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
20 # CA 95054 USA or visit www.sun.com if you need additional information or 20 # or visit www.oracle.com if you need additional information or have any
21 # have any questions. 21 # questions.
22 # 22 #
23 23
24 # 24 #
25 # This file format must remain compatible with both 25 # This file format must remain compatible with both
26 # GNU Makefile and Microsoft nmake formats. 26 # GNU Makefile and Microsoft nmake formats.
27 # 27 #
28 28
29 # Don't put quotes (fail windows build). 29 # Don't put quotes (fail windows build).
30 HOTSPOT_VM_DISTRO=Java HotSpot(TM) 30 HOTSPOT_VM_DISTRO=Java HotSpot(TM)
31 COMPANY_NAME=Sun Microsystems, Inc. 31 COMPANY_NAME=Oracle Corporation
32 PRODUCT_NAME=Java(TM) Platform SE 32 PRODUCT_NAME=Java(TM) Platform SE