summaryrefslogtreecommitdiff
path: root/helpcontent2/settings.pmk
diff options
context:
space:
mode:
authorOliver Bolte <obo@openoffice.org>2005-04-29 08:14:07 +0000
committerOliver Bolte <obo@openoffice.org>2005-04-29 08:14:07 +0000
commit5a28770b6b093bbefd81bc7f35e017ce155674e7 (patch)
treef3085839a7f912133f44f1abd116e24157f1853f /helpcontent2/settings.pmk
parent3ecbbb9edbeb1ef45e1ff45e1ff2df69a708c0d8 (diff)
INTEGRATION: CWS pj26 (1.4.2); FILE MERGED
2005/04/20 16:59:01 pjanik 1.4.2.1: #i47607#: do not redefine my_cp. Patch from vq.
Diffstat (limited to 'helpcontent2/settings.pmk')
-rwxr-xr-xhelpcontent2/settings.pmk6
1 files changed, 3 insertions, 3 deletions
diff --git a/helpcontent2/settings.pmk b/helpcontent2/settings.pmk
index f2352b546..6b2665844 100755
--- a/helpcontent2/settings.pmk
+++ b/helpcontent2/settings.pmk
@@ -1,10 +1,10 @@
-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
+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)
+my_cp!:=$(my_cp)$(PATH_SEPERATOR)$(DB_JAR)
.ELSE
-my_cp:=$(my_cp)$(PATH_SEPERATOR)$(SOLARBINDIR)$/db.jar
+my_cp!:=$(my_cp)$(PATH_SEPERATOR)$(SOLARBINDIR)$/db.jar
.ENDIF
.INCLUDE : $(INCCOM)$/aux_langs.mk