Mercurial > hg > truffle

diff make/windows/projectfiles/compiler1/Makefile @ 2044:06f017f7daa7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge.
author Thomas Wuerthinger <wuerthinger@ssw.jku.at>
date Fri, 07 Jan 2011 18:18:08 +0100
parents aa6e219afbf1
children
line wrap: on
line diff
--- a/make/windows/projectfiles/compiler1/Makefile	Wed Dec 29 20:06:41 2010 +0100
+++ b/make/windows/projectfiles/compiler1/Makefile	Fri Jan 07 18:18:08 2011 +0100
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 1999, 2008, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1999, 2010, 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
@@ -22,7 +22,6 @@
 #  
 #
 
-Variant=compiler1
-!include local.make
+!include ../local.make
 
 !include $(HOTSPOTWORKSPACE)/make/windows/projectfiles/common/Makefile