diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2004-12-16 12:01:34 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2004-12-16 12:01:34 +0000 |
| commit | b393e10605d7bcf326c3eff748f1ba357ff549db (patch) | |
| tree | 2035e982fe486f31df17d60ee1aae15373d08215 /helpcontent2/util/shared/makefile.mk | |
| parent | a9ff1e2455e5ffdbaaad9335a7b62828d6bb23be (diff) | |
INTEGRATION: CWS helpaux (1.8.2); FILE MERGED
2004/12/13 15:07:42 fpe 1.8.2.4: RESYNC: (1.8-1.9); FILE MERGED
2004/12/08 17:42:26 fpe 1.8.2.3: updated makefiles
2004/12/08 12:08:54 fpe 1.8.2.2: conflict resolve
2004/11/30 18:31:00 fpe 1.8.2.1: *** empty log message ***
Diffstat (limited to 'helpcontent2/util/shared/makefile.mk')
| -rw-r--r-- | helpcontent2/util/shared/makefile.mk | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/helpcontent2/util/shared/makefile.mk b/helpcontent2/util/shared/makefile.mk index 52ab6833ea..190f9f462d 100644 --- a/helpcontent2/util/shared/makefile.mk +++ b/helpcontent2/util/shared/makefile.mk @@ -3,9 +3,9 @@ #* $Workfile:$ #* #* Creation date KR 28.06.99 -#* last change $Author: rt $ $Date: 2004-11-27 00:25:32 $ +#* last change $Author: rt $ $Date: 2004-12-16 13:01:34 $ #* -#* $Revision: 1.9 $ +#* $Revision: 1.10 $ #* #* $Logfile:$ #* @@ -23,17 +23,16 @@ TARGET = util # --- Settings ----------------------------------------------------- -.INCLUDE : $(PRJ)$/settings.pmk .INCLUDE : settings.mk +.INCLUDE : $(PRJ)$/settings.pmk -.IF "$(SOLAR_JAVA)"!="" common_build_zip:= zip1generatedlangs=TRUE +zip1langdirs=$(aux_alllangiso) ZIP1TARGET=xhp_shared ZIP1FLAGS= -u -r ZIP1DIR=$(MISC)$/$(LANGDIR) ZIP1LIST=$(LANGDIR)$/text$/shared$/* -x "*.dphh*" -x "*.hzip" -.ENDIF LINKNAME=shared @@ -45,7 +44,7 @@ LINKADDEDFILES= \ -add highcontrast2.css $(PRJ)$/source$/auxiliary$/LANGUAGE$/highcontrast2.css \ -add highcontrastwhite.css $(PRJ)$/source$/auxiliary$/LANGUAGE$/highcontrastwhite.css \ -add highcontrastblack.css $(PRJ)$/source$/auxiliary$/LANGUAGE$/highcontrastblack.css \ - -add err.html $(PRJ)$/source$/auxiliary$/LANGUAGE$/err.html \ + -add err.html $(MISC)$/LANGUAGE$/text$/shared$/05$/err_html.xhp LINKADDEDDEPS= \ @@ -56,7 +55,7 @@ LINKADDEDDEPS= \ $(PRJ)$/source$/auxiliary$/LANGUAGE$/highcontrast2.css \ $(PRJ)$/source$/auxiliary$/LANGUAGE$/highcontrastwhite.css \ $(PRJ)$/source$/auxiliary$/LANGUAGE$/highcontrastblack.css \ - $(PRJ)$/source$/auxiliary$/LANGUAGE$/err.html \ + $(MISC)$/LANGUAGE$/text$/shared$/05$/err_html.xhp LINKLINKFILES= \ |