summaryrefslogtreecommitdiff
path: root/helpcontent2/settings.pmk
diff options
context:
space:
mode:
authorJens-Heiner Rechtien <hr@openoffice.org>2006-04-19 14:05:54 +0000
committerJens-Heiner Rechtien <hr@openoffice.org>2006-04-19 14:05:54 +0000
commit2273188e9e0005ac0d14658cab567a222db62ff5 (patch)
tree9b56754384a4cc1554344a4e4b7af42392488d3c /helpcontent2/settings.pmk
parent8be668f7553cd03d1daab8ab35d57d417433d73d (diff)
INTEGRATION: CWS systemjava (1.6.6); FILE MERGED
2006/03/23 11:32:54 cmc 1.6.6.1: #i52974# enable using system java components
Diffstat (limited to 'helpcontent2/settings.pmk')
-rwxr-xr-xhelpcontent2/settings.pmk12
1 files changed, 4 insertions, 8 deletions
diff --git a/helpcontent2/settings.pmk b/helpcontent2/settings.pmk
index 976d78e47..65b8315ea 100755
--- a/helpcontent2/settings.pmk
+++ b/helpcontent2/settings.pmk
@@ -1,13 +1,9 @@
+XML_APIS_JAR*=$(SOLARBINDIR)$/xml-apis.jar
+XERCES_JAR*=$(SOLARBINDIR)$/xercesImpl.jar
+DB_JAR*=$(SOLARBINDIR)$/db.jar
-my_cp:=$(CLASSPATH)$(PATH_SEPERATOR)$(SOLARBINDIR)$/xml-apis.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/xercesImpl.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
+my_cp:=$(CLASSPATH)$(PATH_SEPERATOR)$(XML_APIS_JAR)$(PATH_SEPERATOR)$(XERCES_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$(PATH_SEPERATOR)$(DB_JAR)
.INCLUDE : $(INCCOM)$/aux_langs.mk
aux_alllangiso:=$(foreach,i,$(alllangiso) $(foreach,j,$(aux_langdirs) $(eq,$i,$j $i $(NULL))))
-