diff options
author | Jens-Heiner Rechtien <hr@openoffice.org> | 2005-02-11 13:53:32 +0000 |
---|---|---|
committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2005-02-11 13:53:32 +0000 |
commit | c96154867796005fbc6a386be478ba19e91b6a6e (patch) | |
tree | 3b54abca3838b957725a9300bbfb220066819f00 /helpcontent2/helpers | |
parent | e0e586d044a9a18073d6f0a6ce46e86b65435114 (diff) |
INTEGRATION: CWS ause018 (1.4.16); FILE MERGED
2005/02/07 18:56:24 hjs 1.4.16.3: #i42057# avoid zip targets for javaless builds
2005/02/07 16:45:40 hjs 1.4.16.2: #i42057# avoid unwanted files in zip
2005/02/07 14:08:11 hjs 1.4.16.1: #i42057# unique TARGET names in generated link makefiles
Diffstat (limited to 'helpcontent2/helpers')
-rw-r--r-- | helpcontent2/helpers/linkmakefile.template | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/helpcontent2/helpers/linkmakefile.template b/helpcontent2/helpers/linkmakefile.template index 27579dc888..8a690380a0 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: rt $ $Date: 2004-12-16 12:28:11 $ +#* last change $Author: hr $ $Date: 2005-02-11 14:53:32 $ #* -#* $Revision: 1.4 $ +#* $Revision: 1.5 $ #* #* $Logfile:$ #* @@ -19,20 +19,22 @@ PRJ = %prj% PRJNAME = helpcontent2 # uniqe name (module wide); # using a modified form of package should do here -TARGET = util +TARGET = util_%module% # --- Settings ----------------------------------------------------- .INCLUDE : settings.mk .INCLUDE : $(PRJ)$/settings.pmk +.IF "$(SOLAR_JAVA)"!="" common_build_zip:= zip1generatedlangs=TRUE zip1langdirs=$(aux_alllangiso) ZIP1TARGET=xhp_%module% ZIP1FLAGS= -u -r ZIP1DIR=$(MISC)$/$(LANGDIR) -ZIP1LIST=$(LANGDIR)$/text$/%module%$/* -x "*.dphh*" -x "*.hzip" +ZIP1LIST=$(LANGDIR)$/text$/%module%$/* -x "*.dphh*" -x "*.hzip" -x "*.created" +.ENDIF # "$(SOLAR_JAVA)"!="" LINKNAME=%module% |