From 03462d65dcb2be5f8ccda2eb80353dce5e2d0d98 Mon Sep 17 00:00:00 2001
From: Noriko Hosoi <nhosoi@redhat.com>
Date: Fri, 25 Mar 2005 02:09:27 +0000
Subject: [Bug 146919] Directory Server rebranding 1) Brandx -> Fedora 2) Pick
 up new internal component set (Admin SDK, Setup SDK, Admin Server) 3) Use JRE
 from the Admin Server package 4) Docs   a) Componentize Docs   b) Rebrand
 Docs   c) Drop packaging Administration Guide in the external version

---
 config/config.mk   | 22 ----------------------
 config/nsinstall.c |  2 +-
 2 files changed, 1 insertion(+), 23 deletions(-)

(limited to 'config')

diff --git a/config/config.mk b/config/config.mk
index d8b7170d..42e10c3e 100644
--- a/config/config.mk
+++ b/config/config.mk
@@ -460,12 +460,10 @@ JAVA_PROG = java	# from the ether
 ## java compiler
 # XXX - ram included from common.mn
 #JAVAC_PROG = javac	# from the ether
-#JAVAC_CLASSPATH = $(JAVA_CLASSPATH):/usr/local/netscape/java/lib/javac.zip
 #JAVAC_FLAGS = -classpath $(JAVAC_CLASSPATH) $(JAVA_OPTIMIZER)
 #JAVAC = $(JAVAC_PROG) $(JAVAC_FLAGS)
 
 PATH_SEPARATOR	= :
-JAVAC_ZIP	= /usr/local/netscape/java/lib/javac.zip
 
 #
 # The canonical classpath for building java libraries
@@ -490,26 +488,6 @@ JAVADOC_PROG = $(JAVA) sun.tools.javadoc.Main
 JAVADOC_FLAGS = -classpath $(JAVAC_CLASSPATH)
 JAVADOC = $(JAVADOC_PROG) $(JAVADOC_FLAGS)
 
-######################################################################
-## javah
-
-ifndef JAVAH_IN_JAVA
-JAVAH_PROG = $(DIST)/bin/javah
-else 
-JAVAH_PROG = $(JAVA) netscape.tools.jric.Main
-endif
-JAVAH_FLAGS = -classpath $(JAVA_CLASSPATH)
-JAVAH = $(JAVAH_PROG) $(JAVAH_FLAGS)
-
-######################################################################
-## jmc
-
-JMCSRCDIR = $(XPDIST)/_jmc
-JMC_PROG = $(JAVA) netscape.tools.jmc.Main
-JMC_CLASSPATH = $(JMCSRCDIR):$(JAVAC_CLASSPATH)
-JMC_FLAGS = -classpath $(JMC_CLASSPATH) -verbose
-JMC = $(JMC_PROG) $(JMC_FLAGS)
-
 ######################################################################
 ## zip
 
diff --git a/config/nsinstall.c b/config/nsinstall.c
index 0da0d1df..df0cae55 100644
--- a/config/nsinstall.c
+++ b/config/nsinstall.c
@@ -4,7 +4,7 @@
  * All rights reserved.
  * END COPYRIGHT BLOCK **/
 /*
-** Netscape portable install command.
+** install command.
 **
 ** Brendan Eich, 7/20/95
 */
-- 
cgit