diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2005-04-11 08:31:48 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2005-04-11 08:31:48 +0000 |
| commit | 2032397bba68a12c616ccd914fcc0f33c667d14e (patch) | |
| tree | 4828f01c8bd28f1e2514fb059b0441a946e207d1 /xmlhelp | |
| parent | f44ad36fdaf05852002eaa1ec09a663662dcd9a1 (diff) | |
INTEGRATION: CWS systemdb (1.19.24); FILE MERGED
2005/04/07 14:38:03 hjs 1.19.24.2: #i34430# avoid warnings
2005/04/06 08:13:04 rene 1.19.24.1: don't copy db.jar, add it to XCLASSPATH
Diffstat (limited to 'xmlhelp')
| -rw-r--r-- | xmlhelp/source/com/sun/star/help/makefile.mk | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/xmlhelp/source/com/sun/star/help/makefile.mk b/xmlhelp/source/com/sun/star/help/makefile.mk index b4326d680468..e9e2d8e08cf5 100644 --- a/xmlhelp/source/com/sun/star/help/makefile.mk +++ b/xmlhelp/source/com/sun/star/help/makefile.mk @@ -3,9 +3,9 @@ #* $Workfile:$ #* #* Creation date KR 28.06.99 -#* last change $Author: obo $ $Date: 2005-01-25 15:29:28 $ +#* last change $Author: hr $ $Date: 2005-04-11 09:31:48 $ #* -#* $Revision: 1.19 $ +#* $Revision: 1.20 $ #* #* $Logfile:$ #* @@ -22,9 +22,15 @@ TARGET = com_sun_star_help .INCLUDE : settings.mk -JARFILES = jaxp.jar parser.jar xt.jar unoil.jar ridl.jar jurt.jar jut.jar xmlsearch.jar db.jar +JARFILES = jaxp.jar parser.jar xt.jar unoil.jar ridl.jar jurt.jar jut.jar xmlsearch.jar EXTRAJARFILES = +.IF "$(SYSTEM_DB)" == "YES" +XCLASSPATH!:=$(XCLASSPATH)$(PATH_SEPERATOR)$(DB_JAR) +.ELSE +JARFILES+= db.jar +.ENDIF + CLASSGENDIR = $(OUT)$/classgen RDB = $(SOLARBINDIR)$/types.rdb JAVAFILES = $(subst,$(CLASSDIR)$/$(PACKAGE)$/, $(subst,.class,.java $(JAVACLASSFILES))) |