From ec48fbe3119ffdeaef0bdce72ffb239c17dfc9f1 Mon Sep 17 00:00:00 2001 From: Jens-Heiner Rechtien Date: Mon, 11 Apr 2005 08:29:48 +0000 Subject: [PATCH] INTEGRATION: CWS systemdb (1.3.34); FILE MERGED 2005/04/07 14:35:35 hjs 1.3.34.2: #i34430# remove dupes 2005/04/06 08:13:04 rene 1.3.34.1: don't copy db.jar, add it to XCLASSPATH --- helpcontent2/settings.pmk | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/helpcontent2/settings.pmk b/helpcontent2/settings.pmk index 9fe776d54b..f2352b5462 100755 --- a/helpcontent2/settings.pmk +++ b/helpcontent2/settings.pmk @@ -1,5 +1,11 @@ -my_cp=$(CLASSPATH)$(PATH_SEPERATOR)$(SOLARBINDIR)$/jaxp.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/parser.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/xt.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/unoil.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/ridl.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/jurt.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/jut.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/xmlsearch.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/db.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/xmlsearch.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/xmlhelp.jar +my_cp=$(CLASSPATH)$(PATH_SEPERATOR)$(SOLARBINDIR)$/jaxp.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/parser.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/xt.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/unoil.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/ridl.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/jurt.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/jut.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/xmlsearch.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/xmlhelp.jar + +.IF "$(SYSTEM_DB)" == "YES" +my_cp:=$(my_cp)$(PATH_SEPERATOR)$(DB_JAR) +.ELSE +my_cp:=$(my_cp)$(PATH_SEPERATOR)$(SOLARBINDIR)$/db.jar +.ENDIF .INCLUDE : $(INCCOM)$/aux_langs.mk