diff options
author | Kurt Zenker <kz@openoffice.org> | 2006-11-08 10:53:48 +0000 |
---|---|---|
committer | Kurt Zenker <kz@openoffice.org> | 2006-11-08 10:53:48 +0000 |
commit | 120502bbdaef5322f6674628f948495ecc12cf62 (patch) | |
tree | f161b9112e991c4b665f370bf2058525f59ccdb1 /helpcontent2 | |
parent | 9a759b6a398af193a9608f8cb44e3638846361d2 (diff) |
INTEGRATION: CWS ause070 (1.10.6); FILE MERGED
2006/10/18 16:27:04 hjs 1.10.6.2: #i70136# change check to work with configure default
2006/10/13 11:18:07 hjs 1.10.6.1: #i70136# second try
Diffstat (limited to 'helpcontent2')
-rw-r--r-- | helpcontent2/source/auxiliary/makefile.mk | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/helpcontent2/source/auxiliary/makefile.mk b/helpcontent2/source/auxiliary/makefile.mk index 9c915ab52a..56fddc9f53 100644 --- a/helpcontent2/source/auxiliary/makefile.mk +++ b/helpcontent2/source/auxiliary/makefile.mk @@ -3,9 +3,9 @@ #* $Workfile:$ #* #* Creation date KR 28.06.99 -#* last change $Author: kz $ $Date: 2006-10-05 10:50:24 $ +#* last change $Author: kz $ $Date: 2006-11-08 11:53:48 $ #* -#* $Revision: 1.10 $ +#* $Revision: 1.11 $ #* #* $Logfile:$ #* @@ -36,6 +36,7 @@ TREEFILES = \ ALLTAR : aux_dirs $(COMMONMISC)$/treefiles.done $(COMMONBIN)$/helpimg.ilst +.IF "$(WITH_LANG)"!="" .IF "$(GUI)"=="UNX" || "$(USE_SHELL)"!="4nt" t_aux_langdirs:=$(shell +find ./ -name "*.cfg" | sed "s/\.\/\///" | sed "s/\.\///" ) .ELSE # "$(GUI)"=="UNX" || "$(USE_SHELL)"!="4nt" @@ -51,6 +52,10 @@ WITH_LANG!:=$(aux_alllangiso) .EXPORT : WITH_LANG LOCTREEFILES:=$(foreach,i,$(aux_alllangiso) $(foreach,j,$(TREEFILES) $(COMMONMISC)$/$i$/$j)) +.ELSE #IF "$(WITH_LANG)"!="" +aux_langdirs:=en-US +LOCTREEFILES:=$(foreach,j,$(TREEFILES) $(COMMONMISC)$/en-US$/$j) +.ENDIF #IF "$(WITH_LANG)"!="" $(COMMONMISC)$/treefiles.done : $(LOCTREEFILES) @+$(PERL) $(PRJ)$/helpers$/update_tree.pl && $(TOUCH) $@ @@ -58,9 +63,13 @@ $(COMMONMISC)$/treefiles.done : $(LOCTREEFILES) %.created: @+-$(MKDIRHIER) $(@:d) && $(TOUCH) $@ -$(LOCTREEFILES) : $(TREEFILES) $(PRJ)$/source$/text$/shared$/localize.sdf $$(@:d)$/dir.created +$(LOCTREEFILES) : $(TREEFILES) $$(@:d)$/dir.created @+$(TOUCH) $@ +.IF "$(WITH_LANG)"!="" +$(LOCTREEFILES) : $(PRJ)$/source$/text$/shared$/localize.sdf +.ENDIF # "$(WITH_LANG)"!="" + aux_dirs .PHONY : echo aux_langdirs:=$(aux_langdirs) > $(INCCOM)$/aux_langs.mk |