diff options
-rw-r--r-- | helpcontent2/helpers/linkmakefile.template | 7 | ||||
-rwxr-xr-x | helpcontent2/makefile.pmk | 6 |
2 files changed, 9 insertions, 4 deletions
diff --git a/helpcontent2/helpers/linkmakefile.template b/helpcontent2/helpers/linkmakefile.template index 397b8d6a2e..5a8a0d7037 100644 --- a/helpcontent2/helpers/linkmakefile.template +++ b/helpcontent2/helpers/linkmakefile.template @@ -3,9 +3,9 @@ #* $Workfile:$ #* #* Creation date KR 28.06.99 -#* last change $Author: ihi $ $Date: 2007-06-05 10:19:44 $ +#* last change $Author: vg $ $Date: 2007-06-08 16:12:22 $ #* -#* $Revision: 1.9 $ +#* $Revision: 1.10 $ #* #* $Logfile:$ #* @@ -26,6 +26,7 @@ TARGET = util_%module% .INCLUDE : settings.mk .INCLUDE : $(PRJ)$/settings.pmk +.IF "$(SOLAR_JAVA)"!="" common_build_zip:= zip1generatedlangs=TRUE zip1langdirs=$(aux_alllangiso) @@ -33,6 +34,8 @@ ZIP1TARGET=xhp_%module% ZIP1FLAGS= -u -r ZIP1DIR=$(COMMONMISC)$/$(LANGDIR) ZIP1LIST=$(LANGDIR)$/text$/%module%$/* -x "*.xhp????*" -x "*.dphh*" -x "*.hzip" -x "*.created" +.ENDIF # "$(SOLAR_JAVA)"!="" + LINKNAME=%module% LINKADDEDFILES= \ diff --git a/helpcontent2/makefile.pmk b/helpcontent2/makefile.pmk index 465a649892..9647c446ff 100755 --- a/helpcontent2/makefile.pmk +++ b/helpcontent2/makefile.pmk @@ -4,9 +4,9 @@ # # $RCSfile: makefile.pmk,v $ # -# $Revision: 1.22 $ +# $Revision: 1.23 $ # -# last change: $Author: ihi $ $Date: 2007-06-05 10:19:23 $ +# last change: $Author: vg $ $Date: 2007-06-08 16:13:43 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -36,7 +36,9 @@ SHELL_PACKAGE:=$(subst,/,$/ $(PACKAGE)) HLANGXHPFILES:=$(foreach,i,$(XHPFILES) $(foreach,j,$(aux_alllangiso) $(COMMONMISC)$/$j$/$(SHELL_PACKAGE)$/$(i:f))) +.IF "$(SOLAR_JAVA)"!="" ALLTAR : $(COMMONMISC)$/$(TARGET).done $(COMMONMISC)$/xhp_changed.flag optix +.ENDIF $(HLANGXHPFILES) : $$(@:d)thisdir.created |