Avoiding reliance on /java/re dir from Sun intranet.

jglick · jglick · commit a699eb3fa9c2 · 2010-01-11T20:34:30.000Z
Also using $JAVA_HOME which seems more standard than $JDKHOME.

svn path=/trunk/; revision=70
diff --git a/jhMaster/JavaHelp/build/GNUmakefile b/jhMaster/JavaHelp/build/GNUmakefile
@@ -40,19 +40,13 @@ SRCDIR=../src
 BINDIR=../javahelp/bin
 PKGDIR=javax/help
 PKGDIRIMPL=com/sun/java/help
+EXTLIBDIR=../../../javahelp_nbproject/lib
+EXTLIBS=$(EXTLIBDIR)/jdic.jar:$(EXTLIBDIR)/jsp-api.jar:$(EXTLIBDIR)/servlet-api.jar
 
 ifeq ($(JSEARCHHOME),)
 JSEARCHHOME=../../JSearch
 endif
 
-ifeq ($(J2EEHOME),)
-J2EEHOME=/java/re/j2sdkee/1.3/archive/fcs/latest/binaries/solsparc
-endif
-
-ifeq ($(JDICHOME),)
-JDICHOME=/java/re/jdic/archive/binaries
-endif
-
 JAVAC=javac
 CP=/bin/cp -f
 
@@ -143,7 +137,7 @@ docs: $(APIDOC)
 $(APIDOC): $(CLASSDIR)/$(PKGDIR) $(ALL_CLASSES) 
 	rm -rf $(APIDOC)
 	mkdir -p $(APIDOC)
-	export CLASSPATH; CLASSPATH=$(SRCDIR)/new:$(SRCDIR)/impl:$(LIBDIR)/jh.jar:$(J2EEHOME)/lib/j2ee.jar:$(JDICHOME)/jdic.jar ; \
+	export CLASSPATH; CLASSPATH=$(SRCDIR)/new:$(SRCDIR)/impl:$(LIBDIR)/jh.jar:$(EXTLIBS) ; \
 	javadoc -public $(JAVADOCFLAGS) -d $(APIDOC) $(TARGETPKG)
 
 clean: 
@@ -153,11 +147,11 @@ clean:
 	$(MAKE) clean
 
 $(CLASSDIR)/%.class: $(SRCDIR)/new/%.java
-	export CLASSPATH; CLASSPATH=$(SRCDIR)/new:$(SRCDIR)/impl:$(CLASSPATH):$(J2EEHOME)/lib/j2ee.jar:$(JDICHOME)/jdic.jar ; \
+	export CLASSPATH; CLASSPATH=$(SRCDIR)/new:$(SRCDIR)/impl:$(CLASSPATH):$(EXTLIBS) ; \
 	$(JAVAC) -d $(CLASSDIR) $<
 
 $(CLASSDIR)/%.class: $(SRCDIR)/impl/%.java
-	export CLASSPATH; CLASSPATH=$(SRCDIR)/new:$(SRCDIR)/impl:$(CLASSPATH):$(J2EEHOME)/lib/j2ee.jar:$(JDICHOME)/jdic.jar ; \
+	export CLASSPATH; CLASSPATH=$(SRCDIR)/new:$(SRCDIR)/impl:$(CLASSPATH):$(EXTLIBS) ; \
 	$(JAVAC) -d $(CLASSDIR) $<
 
 $(CLASSDIR)/$(BASICPKGDIR)/images/%.gif: $(SRCDIR)/new/$(BASICPKGDIR)/images/%.gif
diff --git a/jhMaster/JavaHelp/demos/apidoc/GNUmakefile b/jhMaster/JavaHelp/demos/apidoc/GNUmakefile
@@ -44,11 +44,7 @@
 .SUFFIXES:
 .SUFFIXES: .java .class $(SUFFIXES)
 
-ifeq ($(JDKHOME),)
-JDKHOME=/java/re/j2se/1.3.1/archive/fcs/solsparc
-endif
-
-CLASSPATH=.:../../javahelp/lib/jhall.jar:$(JDKHOME)/lib/tools.jar
+CLASSPATH=.:../../javahelp/lib/jhall.jar:$(JAVA_HOME)/lib/tools.jar
 
 # doclet classes
 DCLASSDIR= dclasses
