From 25c30be105a49c58d664b49698d761de6b73c8a1 Mon Sep 17 00:00:00 2001
From: "Janet B. Anderson" <jba@aps.anl.gov>
Date: Tue, 2 Nov 2004 19:51:54 +0000
Subject: [PATCH] Only one -classpath allowed on a command line (for javadoc).

---
 configure/RULES_JAVA | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/configure/RULES_JAVA b/configure/RULES_JAVA
index d7f3328c9..3c5ebd629 100644
--- a/configure/RULES_JAVA
+++ b/configure/RULES_JAVA
@@ -28,8 +28,10 @@ JARCMD   = $(subst \,/,$(JAVA_BIN)/jar$(EXE) $(JAR_OPTIONS) $@ $(JARINPUT) $(JAR
 vpath %.java .. 
 vpath %.jar .. $(COMMON_DIR)
 
-CLASSPATH=$(addprefix -classpath ,$(USR_PRECLASSPATH) $(INSTALL_JAVA) $(USR_CLASSPATH))
-SOURCEPATH=-sourcepath .:..:../..
+empty:=
+space:= $(empty) $(empty)
+CLASSPATH = -classpath $(subst $(space),:,$(strip $(USR_PRECLASSPATH) $(INSTALL_JAVA) $(USR_CLASSPATH)))
+SOURCEPATH = -sourcepath .:..:../..
 
 #-------------------------------------------------------
 # Java directory