From bef1da2ce728ca00b24a63614e6c1729489c1356 Mon Sep 17 00:00:00 2001
From: Rüdiger Timm <rt@openoffice.org>
Date: Thu, 16 Dec 2004 11:18:39 +0000
Subject: INTEGRATION: CWS helpaux (1.4.2); FILE MERGED 2004/12/06 14:02:09 hjs
 1.4.2.1: #i36415# fix for helpcontent2 auxiliary language problem

---
 helpcontent2/makefile.pmk | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

(limited to 'helpcontent2/makefile.pmk')

diff --git a/helpcontent2/makefile.pmk b/helpcontent2/makefile.pmk
index 190192f3da..cd8612addf 100755
--- a/helpcontent2/makefile.pmk
+++ b/helpcontent2/makefile.pmk
@@ -2,9 +2,9 @@
 #
 #   $RCSfile: makefile.pmk,v $
 #
-#   $Revision: 1.4 $
+#   $Revision: 1.5 $
 #
-#   last change: $Author: hr $ $Date: 2004-11-09 12:06:08 $
+#   last change: $Author: rt $ $Date: 2004-12-16 12:18:39 $
 #
 #   The Contents of this file are made available subject to the terms of
 #   either of the following licenses
@@ -61,7 +61,7 @@
 #*************************************************************************
 
 SHELL_PACKAGE:=$(subst,/,$/ $(PACKAGE))
-HLANGZIPFILES:=$(foreach,i,$(HZIPFILES) $(foreach,j,$(alllangiso) $(MISC)$/$j$/$(SHELL_PACKAGE)$/$(i:b).hzip))
+HLANGZIPFILES:=$(foreach,i,$(HZIPFILES) $(foreach,j,$(aux_alllangiso) $(MISC)$/$j$/$(SHELL_PACKAGE)$/$(i:b).hzip))
 HDEPFILES:=$(foreach,i,$(HLANGZIPFILES) $(i:s/hzip/dphh/))
 
 .IF "$(SOLAR_JAVA)"!=""
@@ -70,13 +70,13 @@ ALLTAR : $(MISC)$/$(TARGET)_dir.done $(MISC)$/$(TARGET)_dep_langs.mk
 
 $(MISC)$/%_dep_langs.mk :
     @+-$(RM) $@ > $(NULLDEV)
-    @+echo helpdep_langs=$(alllangiso) > $@
+    @+echo helpdep_langs=$(aux_alllangiso) > $@
 
 .INCLUDE : $(MISC)$/$(TARGET)_dep_langs.mk
 
 $(MISC)$/$(TARGET)_dep_langs.mk .PHONY :
 
-missing_helpdep_langs=$(alllangiso)
+missing_helpdep_langs=$(aux_alllangiso)
 some_dummy_var:=$(foreach,i,$(helpdep_langs) $(assign missing_helpdep_langs:=$(strip $(subst,$i, $(missing_helpdep_langs)))))
 .IF "$(missing_helpdep_langs)"!=""
 HELPTRANSPHONY:=TRUE
@@ -86,15 +86,15 @@ HELPTRANSPHONY:=TRUE
 
 $(MISC)$/$(TARGET)_dir.done : $(HLANGZIPFILES:s/.hzip/.xhp/) $(HLANGZIPFILES)
     @+-$(MKDIR) -p $(@:d)
-    $(WRAPCMD) java -cp $(my_cp) com.sun.star.help.HelpCompiler -pprefix $(MISC) -ppostfix $(SHELL_PACKAGE) -src "$(PRJ)$/source" -sty "$(PRJ)$/source$/auxiliary$/embed.xsl" -idx "$(PRJ)$/source$/auxiliary$/index.xsl" -mod $(MODULE) -lang $(alllangiso:t",") -c $(mktmp $(uniq $(^:f:s/.hzip/.xhp/))) && $(TOUCH) $@
+    $(WRAPCMD) java -cp $(my_cp) com.sun.star.help.HelpCompiler -pprefix $(MISC) -ppostfix $(SHELL_PACKAGE) -src "$(PRJ)$/source" -sty "$(PRJ)$/source$/auxiliary$/embed.xsl" -idx "$(PRJ)$/source$/auxiliary$/index.xsl" -mod $(MODULE) -lang $(aux_alllangiso:t",") -c $(mktmp $(uniq $(^:f:s/.hzip/.xhp/))) && $(TOUCH) $@
 
 $(MISC)$/%.dphh : $(MISC)$/%.dphh_
     @+$(RENAME) {$@}_ $@
 
-$(MISC)$/{$(alllangiso)}$/$(SHELL_PACKAGE)$/%.xhp : %.xhp;
+$(MISC)$/{$(aux_alllangiso)}$/$(SHELL_PACKAGE)$/%.xhp : %.xhp;
 
-$(foreach,i,$(HZIPFILES:b) $(MISC)$/$(TARGET).$i.done) : $(MISC)$/{$(alllangiso)}$/$(SHELL_PACKAGE)$/$$(@:b:e:s/.//).xhp
-    @+$(WRAPCMD) helpex -p help2 -r $(PRJ) -i $(uniq $(<:f)) -x $(MISC) -y $(SHELL_PACKAGE)$/$(@:b:e:s/.//).xhp -l all -lf $(alllangiso:t",") -m localize.sdf && $(TOUCH) $@
+$(foreach,i,$(HZIPFILES:b) $(MISC)$/$(TARGET).$i.done) : $(MISC)$/{$(aux_alllangiso)}$/$(SHELL_PACKAGE)$/$$(@:b:e:s/.//).xhp
+    @+$(WRAPCMD) helpex -p help2 -r $(PRJ) -i $(uniq $(<:f)) -x $(MISC) -y $(SHELL_PACKAGE)$/$(@:b:e:s/.//).xhp -l all -lf $(aux_alllangiso:t",") -m localize.sdf && $(TOUCH) $@
 
 # urks - dmake mixes up operators and strings :-(
 .IF "$(HLANGZIPFILES:s/defined/xxx/)"!=""
-- 
cgit