summaryrefslogtreecommitdiff
path: root/helpcontent2/util/shared
diff options
context:
space:
mode:
authorJens-Heiner Rechtien <hr@openoffice.org>2004-11-09 10:47:51 +0000
committerJens-Heiner Rechtien <hr@openoffice.org>2004-11-09 10:47:51 +0000
commit251d88401575ea6e4bdedbc6bf74c9053af8f709 (patch)
tree653609a00c1a8c5959c08aff396189eed815a20e /helpcontent2/util/shared
parentad3c7ee0d958e3e1a913dc7c201360844d407d47 (diff)
INTEGRATION: CWS nojava1 (1.7.8); FILE MERGED
2004/10/15 19:49:54 haggai 1.7.8.1: #i35639# Disable helpcontent2 when no JDK is available
Diffstat (limited to 'helpcontent2/util/shared')
-rw-r--r--helpcontent2/util/shared/makefile.mk6
1 files changed, 4 insertions, 2 deletions
diff --git a/helpcontent2/util/shared/makefile.mk b/helpcontent2/util/shared/makefile.mk
index fb60272747..4c0e2f7eb2 100644
--- a/helpcontent2/util/shared/makefile.mk
+++ b/helpcontent2/util/shared/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:51 $
#*
-#* $Revision: 1.7 $
+#* $Revision: 1.8 $
#*
#* $Logfile:$
#*
@@ -26,12 +26,14 @@ TARGET = shared_util
.INCLUDE : $(PRJ)$/settings.pmk
.INCLUDE : settings.mk
+.IF "$(SOLAR_JAVA)"!=""
common_build_zip:=
zip1generatedlangs=TRUE
ZIP1TARGET=shared_xhp
ZIP1FLAGS= -u -r
ZIP1DIR=$(MISC)$/$(LANGDIR)
ZIP1LIST=$(LANGDIR)$/text$/shared$/* -x "*.dphh*" -x "*.hzip"
+.ENDIF
LINKNAME=shared