diff options
| author | Jan Holesovsky <kendy@suse.cz> | 2011-05-30 13:12:13 +0200 |
|---|---|---|
| committer | Jan Holesovsky <kendy@suse.cz> | 2011-05-30 13:12:13 +0200 |
| commit | e2b05042bc748b1788d36dfcd7689ca6a8d933fc (patch) | |
| tree | cff44f18a9f149a597247d37d8adbb18e2b70052 /helpcontent2 | |
| parent | 21c234bc56604449c74f44b0dc107aff6e69b42a (diff) | |
| parent | 0c8a27cfa9036efc45974a02751b70034ad5bbd5 (diff) | |
Merge commit 'libreoffice-3.4.0.2'
Diffstat (limited to 'helpcontent2')
| -rwxr-xr-x | helpcontent2/settings.pmk | 4 | ||||
| -rw-r--r-- | helpcontent2/source/auxiliary/makefile.mk | 8 |
2 files changed, 9 insertions, 3 deletions
diff --git a/helpcontent2/settings.pmk b/helpcontent2/settings.pmk index c9d2722258..185438e89b 100755 --- a/helpcontent2/settings.pmk +++ b/helpcontent2/settings.pmk @@ -1,4 +1,5 @@ .INCLUDE : $(LOCAL_COMMON_OUT)/inc$/aux_langs.mk +.INCLUDE : $(LOCAL_COMMON_OUT)/inc$/help_exist.mk my_cp:=$(CLASSPATH)$(PATH_SEPERATOR)$(SOLARBINDIR)$/jaxp.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/juh.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/parser.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/xt.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/unoil.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/ridl.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/jurt.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/xmlsearch.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/LuceneHelpWrapper.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/HelpIndexerTool.jar$ @@ -12,4 +13,5 @@ my_cp!:=$(my_cp)$(PATH_SEPERATOR)$(SOLARBINDIR)/lucene-core-2.3.jar$(PATH_SEPERA JAVA_LIBRARY_PATH= -Djava.library.path=$(SOLARSHAREDBIN) .ENDIF -aux_alllangiso:=$(foreach,i,$(alllangiso) $(foreach,j,$(aux_langdirs) $(eq,$i,$j $i $(NULL)))) +aux_alllangiso_all:=$(foreach,i,$(alllangiso) $(foreach,j,$(aux_langdirs) $(eq,$i,$j $i $(NULL)))) +aux_alllangiso:=$(foreach,i,$(aux_alllangiso_all) $(foreach,j,$(help_exist) $(eq,$i,$j $i $(NULL)))) diff --git a/helpcontent2/source/auxiliary/makefile.mk b/helpcontent2/source/auxiliary/makefile.mk index 48b02b5d0e..94b1370d48 100644 --- a/helpcontent2/source/auxiliary/makefile.mk +++ b/helpcontent2/source/auxiliary/makefile.mk @@ -46,7 +46,7 @@ TREEFILES = \ # --- Targets ------------------------------------------------------ .INCLUDE : target.mk -.EXPORT : LOCALIZESDF LOCALIZATION_FOUND TRYSDF +.EXPORT : LOCALIZESDF LOCALIZATION_FOUND TRYSDF L10N_MODULE ALLTAR : aux_dirs $(COMMONMISC)$/treefiles.done $(COMMONBIN)$/helpimg.ilst @@ -54,8 +54,10 @@ ALLTAR : aux_dirs $(COMMONMISC)$/treefiles.done $(COMMONBIN)$/helpimg.ilst t_aux_langdirs:=$(shell @find ./ -name "*.cfg" | sed "s/\.\/\///" | sed "s/\.\///" ) aux_langdirs:=$(uniq $(t_aux_langdirs:d:d)) +help_exist:=$(shell @find $(L10N_MODULE)/source/ -type d -name "helpcontent2" | sed -e "s|/helpcontent2||" -e "s|^.*/||" ) en-US -aux_alllangiso:=$(foreach,i,$(alllangiso) $(foreach,j,$(aux_langdirs) $(eq,$i,$j $i $(NULL)))) +aux_alllangiso_all:=$(foreach,i,$(alllangiso) $(foreach,j,$(aux_langdirs) $(eq,$i,$j $i $(NULL)))) +aux_alllangiso:=$(foreach,i,$(aux_alllangiso_all) $(foreach,j,$(help_exist) $(eq,$i,$j $i $(NULL)))) WITH_LANG!:=$(aux_alllangiso) @@ -64,6 +66,7 @@ WITH_LANG!:=$(aux_alllangiso) LOCTREEFILES:=$(foreach,i,$(aux_alllangiso) $(foreach,j,$(TREEFILES) $(COMMONMISC)$/$i$/$j)) .ELSE #IF "$(WITH_LANG)"!="" aux_langdirs:=en-US +help_exist:=en-US LOCTREEFILES:=$(foreach,j,$(TREEFILES) $(COMMONMISC)$/en-US$/$j) .ENDIF #IF "$(WITH_LANG)"!="" @@ -92,6 +95,7 @@ $(LOCTREEFILES) : $(COMMONMISC)/unpack.done aux_dirs .PHONY : echo aux_langdirs:=$(aux_langdirs) > $(LOCAL_COMMON_OUT)/inc$/aux_langs.mk + echo help_exist:=$(help_exist) > $(LOCAL_COMMON_OUT)/inc$/help_exist.mk $(COMMONBIN)$/helpimg.ilst .PHONY: -$(RM) $@ |