From 4210d96d8179eae7604090cea09ae86db2e66183 Mon Sep 17 00:00:00 2001
From: Jens-Heiner Rechtien <hr@openoffice.org>
Date: Tue, 9 Nov 2004 11:06:08 +0000
Subject: INTEGRATION: CWS nojava1 (1.1.8); FILE MERGED 2004/11/02 21:58:44
 haggai 1.1.8.2: RESYNC: (1.1-1.2); FILE MERGED 2004/10/15 19:49:51 haggai
 1.1.8.1: #i35639# Disable helpcontent2 when no JDK is available

---
 helpcontent2/makefile.pmk | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'helpcontent2/makefile.pmk')

diff --git a/helpcontent2/makefile.pmk b/helpcontent2/makefile.pmk
index a04364da70..190192f3da 100755
--- a/helpcontent2/makefile.pmk
+++ b/helpcontent2/makefile.pmk
@@ -2,9 +2,9 @@
 #
 #   $RCSfile: makefile.pmk,v $
 #
-#   $Revision: 1.3 $
+#   $Revision: 1.4 $
 #
-#   last change: $Author: pjunck $ $Date: 2004-11-03 12:41:33 $
+#   last change: $Author: hr $ $Date: 2004-11-09 12:06:08 $
 #
 #   The Contents of this file are made available subject to the terms of
 #   either of the following licenses
@@ -64,7 +64,9 @@ SHELL_PACKAGE:=$(subst,/,$/ $(PACKAGE))
 HLANGZIPFILES:=$(foreach,i,$(HZIPFILES) $(foreach,j,$(alllangiso) $(MISC)$/$j$/$(SHELL_PACKAGE)$/$(i:b).hzip))
 HDEPFILES:=$(foreach,i,$(HLANGZIPFILES) $(i:s/hzip/dphh/))
 
+.IF "$(SOLAR_JAVA)"!=""
 ALLTAR : $(MISC)$/$(TARGET)_dir.done $(MISC)$/$(TARGET)_dep_langs.mk
+.ENDIF
 
 $(MISC)$/%_dep_langs.mk :
     @+-$(RM) $@ > $(NULLDEV)
-- 
cgit