# HG changeset patch
# User dcubed
# Date 1392065933 28800
# Node ID 7865629d6f225e0c27c1f953b56d5dc78b08bc8a
# Parent  5eee9a9aeb7ad17745ee8f3e35446f1f73ec03f9# Parent  4802ce6fbff66b26f4a91152b66c069f8439e064
Merge

diff -r 4802ce6fbff6 -r 7865629d6f22 make/bsd/makefiles/optimized.make
--- a/make/bsd/makefiles/optimized.make	Mon Feb 10 17:49:17 2014 +0100
+++ b/make/bsd/makefiles/optimized.make	Mon Feb 10 12:58:53 2014 -0800
@@ -22,7 +22,7 @@
 #  
 #
 
-# Sets make macros for making optimized version of Gamma VM
+# Sets make macros for making optimized version of HotSpot VM
 # (This is the "product", not the "release" version.)
 
 # Compiler specific OPT_CFLAGS are passed in from gcc.make, sparcWorks.make
diff -r 4802ce6fbff6 -r 7865629d6f22 make/bsd/makefiles/product.make
--- a/make/bsd/makefiles/product.make	Mon Feb 10 17:49:17 2014 +0100
+++ b/make/bsd/makefiles/product.make	Mon Feb 10 12:58:53 2014 -0800
@@ -22,7 +22,7 @@
 #  
 #
 
-# Sets make macros for making optimized version of Gamma VM
+# Sets make macros for making optimized version of HotSpot VM
 # (This is the "product", not the "release" version.)
 
 # Compiler specific OPT_CFLAGS are passed in from gcc.make, sparcWorks.make
diff -r 4802ce6fbff6 -r 7865629d6f22 make/bsd/makefiles/top.make
--- a/make/bsd/makefiles/top.make	Mon Feb 10 17:49:17 2014 +0100
+++ b/make/bsd/makefiles/top.make	Mon Feb 10 12:58:53 2014 -0800
@@ -128,7 +128,7 @@
 	@$(UpdatePCH)
 	@$(MAKE) -f vm.make $(MFLAGS-adjusted)
 
-install gamma: the_vm
+install : the_vm
 	@$(MAKE) -f vm.make $@
 
 # next rules support "make foo.[ois]"
diff -r 4802ce6fbff6 -r 7865629d6f22 make/linux/makefiles/optimized.make
--- a/make/linux/makefiles/optimized.make	Mon Feb 10 17:49:17 2014 +0100
+++ b/make/linux/makefiles/optimized.make	Mon Feb 10 12:58:53 2014 -0800
@@ -22,7 +22,7 @@
 #  
 #
 
-# Sets make macros for making optimized version of Gamma VM
+# Sets make macros for making optimized version of HotSpot VM
 # (This is the "product", not the "release" version.)
 
 # Compiler specific OPT_CFLAGS are passed in from gcc.make, sparcWorks.make
diff -r 4802ce6fbff6 -r 7865629d6f22 make/linux/makefiles/product.make
--- a/make/linux/makefiles/product.make	Mon Feb 10 17:49:17 2014 +0100
+++ b/make/linux/makefiles/product.make	Mon Feb 10 12:58:53 2014 -0800
@@ -22,7 +22,7 @@
 #  
 #
 
-# Sets make macros for making optimized version of Gamma VM
+# Sets make macros for making optimized version of HotSpot VM
 # (This is the "product", not the "release" version.)
 
 # Compiler specific OPT_CFLAGS are passed in from gcc.make, sparcWorks.make
diff -r 4802ce6fbff6 -r 7865629d6f22 make/linux/makefiles/top.make
--- a/make/linux/makefiles/top.make	Mon Feb 10 17:49:17 2014 +0100
+++ b/make/linux/makefiles/top.make	Mon Feb 10 12:58:53 2014 -0800
@@ -122,7 +122,7 @@
 	@$(UpdatePCH)
 	@$(MAKE) -f vm.make $(MFLAGS-adjusted)
 
-install gamma: the_vm
+install: the_vm
 	@$(MAKE) -f vm.make $@
 
 # next rules support "make foo.[ois]"
diff -r 4802ce6fbff6 -r 7865629d6f22 make/solaris/makefiles/optimized.make
--- a/make/solaris/makefiles/optimized.make	Mon Feb 10 17:49:17 2014 +0100
+++ b/make/solaris/makefiles/optimized.make	Mon Feb 10 12:58:53 2014 -0800
@@ -22,7 +22,7 @@
 #  
 #
 
-# Sets make macros for making optimized version of Gamma VM
+# Sets make macros for making optimized version of HotSpot VM
 # (This is the "product", not the "release" version.)
 
 # Compiler specific OPT_CFLAGS are passed in from gcc.make, sparcWorks.make
diff -r 4802ce6fbff6 -r 7865629d6f22 make/solaris/makefiles/product.make
--- a/make/solaris/makefiles/product.make	Mon Feb 10 17:49:17 2014 +0100
+++ b/make/solaris/makefiles/product.make	Mon Feb 10 12:58:53 2014 -0800
@@ -22,7 +22,7 @@
 #  
 #
 
-# Sets make macros for making optimized version of Gamma VM
+# Sets make macros for making optimized version of HotSpot VM
 # (This is the "product", not the "release" version.)
 
 # Compiler specific OPT_CFLAGS are passed in from gcc.make, sparcWorks.make
diff -r 4802ce6fbff6 -r 7865629d6f22 make/solaris/makefiles/top.make
--- a/make/solaris/makefiles/top.make	Mon Feb 10 17:49:17 2014 +0100
+++ b/make/solaris/makefiles/top.make	Mon Feb 10 12:58:53 2014 -0800
@@ -114,7 +114,7 @@
 the_vm: vm_build_preliminaries $(adjust-mflags)
 	@$(MAKE) -f vm.make $(MFLAGS-adjusted)
 
-install gamma: the_vm
+install: the_vm
 	@$(MAKE) -f vm.make $@
 
 # next rules support "make foo.[oi]"