From d153e2bb11bc2cdebd234e113d4595ff692b2c7f Mon Sep 17 00:00:00 2001
From: ohair <unknown>
Date: Sun, 20 Jun 2010 14:51:33 -0700
Subject: [PATCH] 6960853: Cleanup makefiles, remove unused vars etc.
 Reviewed-by: alanb

---
 make/common/shared/Defs-control.gmk | 3 ---
 make/netbeans/README                | 4 ++--
 make/netbeans/world/README          | 4 ++--
 make/netbeans/world/build.xml       | 4 ++--
 4 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/make/common/shared/Defs-control.gmk b/make/common/shared/Defs-control.gmk
index b5f06e752..4e545ca99 100644
--- a/make/common/shared/Defs-control.gmk
+++ b/make/common/shared/Defs-control.gmk
@@ -35,9 +35,6 @@ ifndef JDK_MAKE_SHARED_DIR
   JDK_MAKE_SHARED_DIR = $(JDK_TOPDIR)/make/common/shared
 endif
 
-ifndef CONTROL_TOPDIR
-  CONTROL_TOPDIR=$(TOPDIR)
-endif
 ifndef HOTSPOT_TOPDIR
   HOTSPOT_TOPDIR=$(TOPDIR)/hotspot
 endif
diff --git a/make/netbeans/README b/make/netbeans/README
index 8f68dce0e..b23433401 100644
--- a/make/netbeans/README
+++ b/make/netbeans/README
@@ -204,8 +204,8 @@ Provided NetBeans projects
         note that pretty much regardless of your hardware, this *will* take
         a long time, and use *lots* of disk space (more than 3GB). The
         results of the build are in
-        *install-dir*/control/build/*platform*-*arch* and
-        *install-dir*/control/build/*platform*-*arch*-fastdebug.
+        *install-dir*/build/*platform*-*arch* and
+        *install-dir*/build/*platform*-*arch*-fastdebug.
 
         Consult the project's README file for details.
 
diff --git a/make/netbeans/world/README b/make/netbeans/world/README
index 72c21a933..54c2ccc1f 100644
--- a/make/netbeans/world/README
+++ b/make/netbeans/world/README
@@ -10,6 +10,6 @@ project code, you might prefer to build it from the command line using ant.
 Please note: the results of building this project are *not* put in the place
 used by other projects.  In this case, the results are place in
 
-    <install-dir>/control/build/<platform>-<arch>
+    <install-dir>/build/<platform>-<arch>
 and
-    <install-dir>/control/build/<platform>-<arch>-fastdebug
+    <install-dir>/build/<platform>-<arch>-fastdebug
diff --git a/make/netbeans/world/build.xml b/make/netbeans/world/build.xml
index 99dbfbf69..b502c2835 100644
--- a/make/netbeans/world/build.xml
+++ b/make/netbeans/world/build.xml
@@ -34,11 +34,11 @@
     <import file="../common/shared.xml"/>
 
     <target name="-build-make" depends="-make.init" if="use.make">
-        <make-run target="dev" dir="${root}/../control/make" opts="SKIP_COMPARE_IMAGES=true"/>
+        <make-run target="dev" dir="${root}/.." opts="SKIP_COMPARE_IMAGES=true"/>
     </target>
 
     <target name="-clean-make" depends="-make.init" if="use.make">
-        <make-run target="clean" dir="${root}/../control/make"/>
+        <make-run target="clean" dir="${root}/.."/>
     </target>
 
 </project>
-- 
GitLab