summaryrefslogtreecommitdiffstats
path: root/config
diff options
context:
space:
mode:
authorNoriko Hosoi <nhosoi@redhat.com>2005-03-25 02:09:27 +0000
committerNoriko Hosoi <nhosoi@redhat.com>2005-03-25 02:09:27 +0000
commit03462d65dcb2be5f8ccda2eb80353dce5e2d0d98 (patch)
tree3ea2acadf10f45f086978ba080794fe92985ce90 /config
parentb6bff935c117b5042cd2a9809218607c01bea965 (diff)
downloadds-03462d65dcb2be5f8ccda2eb80353dce5e2d0d98.tar.gz
ds-03462d65dcb2be5f8ccda2eb80353dce5e2d0d98.tar.xz
ds-03462d65dcb2be5f8ccda2eb80353dce5e2d0d98.zip
[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
Diffstat (limited to 'config')
-rw-r--r--config/config.mk22
-rw-r--r--config/nsinstall.c2
2 files changed, 1 insertions, 23 deletions
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
@@ -491,26 +489,6 @@ 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
ZIP_PROG = 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
*/