diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2004-11-09 10:46:42 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2004-11-09 10:46:42 +0000 |
| commit | 0e68762323d73fc4fce642eaa448781853fc1d4b (patch) | |
| tree | fdabb3ddfe828913e8b26f64c2886ba557784631 /helpcontent2/util | |
| parent | 574e04cc23c821652f2c446bca5b7d0eabd6af43 (diff) | |
INTEGRATION: CWS nojava1 (1.2.8); FILE MERGED
2004/11/02 22:24:13 haggai 1.2.8.2: RESYNC: (1.2-1.3); FILE MERGED
2004/10/15 19:49:52 haggai 1.2.8.1: #i35639# Disable helpcontent2 when no JDK is available
Diffstat (limited to 'helpcontent2/util')
| -rwxr-xr-x | helpcontent2/util/target.pmk | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/helpcontent2/util/target.pmk b/helpcontent2/util/target.pmk index c09e1de7c0..e9f28da13d 100755 --- a/helpcontent2/util/target.pmk +++ b/helpcontent2/util/target.pmk @@ -2,9 +2,9 @@ # # $RCSfile: target.pmk,v $ # -# $Revision: 1.3 $ +# $Revision: 1.4 $ # -# last change: $Author: hr $ $Date: 2004-10-11 13:44:19 $ +# last change: $Author: hr $ $Date: 2004-11-09 11:46:42 $ # # The Contents of this file are made available subject to the terms of # either of the following licenses @@ -63,7 +63,9 @@ LINKALLTARGETS=$(foreach,i,$(alllangiso) $(BIN)$/$(LINKNAME)_$i.zip) LINKALLADDEDDEPS=$(foreach,i,$(alllangiso) $(subst,LANGUAGE,$i $(LINKADDEDDPES))) +.IF "$(SOLAR_JAVA)"!="" ALLTAR : $(LINKALLTARGETS) +.ENDIF $(LINKALLTARGETS) : $(foreach,i,$(LINKLINKFILES) $(MISC)$/$$(@:b:s/_/./:e:s/.//)/$i) $(subst,LANGUAGE,$$(@:b:s/_/./:e:s/.//) $(LINKADDEDDEPS)) @+-$(MKDIR) -p $(@:d) |