diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2004-11-09 10:47:39 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2004-11-09 10:47:39 +0000 |
| commit | ad3c7ee0d958e3e1a913dc7c201360844d407d47 (patch) | |
| tree | 46b9b697d2ffe5b76f6a0d6db10cfaee618f63ed /helpcontent2 | |
| parent | 1f2d6bf0f051cb1841ebe283e9bc673bd89b5c42 (diff) | |
INTEGRATION: CWS nojava1 (1.6.8); FILE MERGED
2004/10/15 19:49:53 haggai 1.6.8.1: #i35639# Disable helpcontent2 when no JDK is available
Diffstat (limited to 'helpcontent2')
| -rw-r--r-- | helpcontent2/util/scalc/makefile.mk | 7 | ||||
| -rw-r--r-- | helpcontent2/util/sdraw/makefile.mk | 6 |
2 files changed, 8 insertions, 5 deletions
diff --git a/helpcontent2/util/scalc/makefile.mk b/helpcontent2/util/scalc/makefile.mk index 9e4c0902e2..c7fbad9d1c 100644 --- a/helpcontent2/util/scalc/makefile.mk +++ b/helpcontent2/util/scalc/makefile.mk @@ -3,9 +3,9 @@ #* $Workfile:$ #* #* Creation date KR 28.06.99 -#* last change $Author: hjs $ $Date: 2004-08-26 15:17:44 $ +#* last change $Author: hr $ $Date: 2004-11-09 11:47:14 $ #* -#* $Revision: 1.6 $ +#* $Revision: 1.7 $ #* #* $Logfile:$ #* @@ -28,11 +28,12 @@ TARGET = scalc_util common_build_zip:= zip1generatedlangs=TRUE +.IF "$(SOLAR_JAVA)"!="" ZIP1TARGET=scalc_xhp ZIP1FLAGS= -u -r ZIP1DIR=$(MISC)$/$(LANGDIR) ZIP1LIST=$(LANGDIR)$/text$/scalc$/* -x "*.dphh*" -x "*.hzip" - +.ENDIF LINKNAME=scalc LINKADDEDFILES= \ diff --git a/helpcontent2/util/sdraw/makefile.mk b/helpcontent2/util/sdraw/makefile.mk index 8a1e23037e..3f274a0911 100644 --- a/helpcontent2/util/sdraw/makefile.mk +++ b/helpcontent2/util/sdraw/makefile.mk @@ -3,9 +3,9 @@ #* $Workfile:$ #* #* Creation date KR 28.06.99 -#* last change $Author: hjs $ $Date: 2004-08-26 15:17:45 $ +#* last change $Author: hr $ $Date: 2004-11-09 11:47:39 $ #* -#* $Revision: 1.6 $ +#* $Revision: 1.7 $ #* #* $Logfile:$ #* @@ -26,12 +26,14 @@ TARGET = sdraw_util .INCLUDE : $(PRJ)$/settings.pmk .INCLUDE : settings.mk +.IF "$(SOLAR_JAVA)"!="" common_build_zip:= zip1generatedlangs=TRUE ZIP1TARGET=sdraw_xhp ZIP1FLAGS= -u -r ZIP1DIR=$(MISC)$/$(LANGDIR) ZIP1LIST=$(LANGDIR)$/text$/sdraw$/* -x "*.dphh*" -x "*.hzip" +.ENDIF LINKNAME=sdraw |