summaryrefslogtreecommitdiff
path: root/helpcontent2/makefile.pmk
diff options
context:
space:
mode:
authorJens-Heiner Rechtien <hr@openoffice.org>2004-11-09 11:06:08 +0000
committerJens-Heiner Rechtien <hr@openoffice.org>2004-11-09 11:06:08 +0000
commit4210d96d8179eae7604090cea09ae86db2e66183 (patch)
treeb71c847df1aec48447637866c725e6a7868dd06b /helpcontent2/makefile.pmk
parentfbd42d5a9d4cc6cfb7a7d0074767efe5cf905238 (diff)
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
Diffstat (limited to 'helpcontent2/makefile.pmk')
-rwxr-xr-xhelpcontent2/makefile.pmk6
1 files changed, 4 insertions, 2 deletions
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)