CWS-TOOLING: integrate CWS commonhelpooo/DEV300_m80ooo/DEV300_m79

2 files changed, 19 insertions, 19 deletions

diff --git a/helpcontent2/helpers/createmakefile.pl b/helpcontent2/helpers/createmakefile.pl
index 909384b4fd..3511eca164 100644
--- a/helpcontent2/helpers/createmakefile.pl
+++ b/helpcontent2/helpers/createmakefile.pl
@@ -146,13 +146,13 @@ for $d(@dirs) {
     $linkaddedfiles = <<"LAF";
    -add $module.cfg \$(PRJ)\$/source\$/auxiliary\$/LANGUAGE\$/$module.cfg \\
    -add $module.tree \$(COMMONMISC)\$/LANGUAGE\$/$module.tree \\
-   -add $module.jar  \$(BIN)\$/xhp_${module}_LANGUAGE.zip
+   -add $module.jar  \$(COMMONBIN)\$/xhp_${module}_LANGUAGE.zip
 LAF
     
     $linkaddeddeps = <<"LAD";
    \$(PRJ)\$/source\$/auxiliary\$/LANGUAGE\$/$module.cfg \\
    \$(COMMONMISC)\$/LANGUAGE\$/$module.tree \\
-   \$(BIN)\$/xhp_${module}_LANGUAGE.zip
+   \$(COMMONBIN)\$/xhp_${module}_LANGUAGE.zip
 LAD
     
     $linklinkfiles = '';
@@ -174,13 +174,13 @@ LAD
     $linkaddedfiles = <<"LAF";
    -add $module.cfg \$(PRJ)\$/source\$/auxiliary\$/LANGUAGE\$/$module.cfg \\
    -add $module.tree \$(COMMONMISC)\$/LANGUAGE\$/$module.tree \\
-   -add $module.jar  \$(BIN)\$/xhp_${module}_LANGUAGE.zip
+   -add $module.jar  \$(COMMONBIN)\$/xhp_${module}_LANGUAGE.zip
 LAF
     
     $linkaddeddeps = <<"LAD";
    \$(PRJ)\$/source\$/auxiliary\$/LANGUAGE\$/$module.cfg \\
    \$(COMMONMISC)\$/LANGUAGE\$/$module.tree \\
-   \$(BIN)\$/xhp_${module}_LANGUAGE.zip
+   \$(COMMONBIN)\$/xhp_${module}_LANGUAGE.zip
 LAD
     
     $linklinkfiles = '';
@@ -202,13 +202,13 @@ LAD
     $linkaddedfiles = <<"LAF";
    -add $module.cfg \$(PRJ)\$/source\$/auxiliary\$/LANGUAGE\$/$module.cfg \\
    -add $module.tree \$(COMMONMISC)\$/LANGUAGE\$/$module.tree \\
-   -add $module.jar  \$(BIN)\$/xhp_${module}_LANGUAGE.zip
+   -add $module.jar  \$(COMMONBIN)\$/xhp_${module}_LANGUAGE.zip
 LAF
     
     $linkaddeddeps = <<"LAD";
    \$(PRJ)\$/source\$/auxiliary\$/LANGUAGE\$/$module.cfg \\
    \$(COMMONMISC)\$/LANGUAGE\$/$module.tree \\
-   \$(BIN)\$/xhp_${module}_LANGUAGE.zip
+   \$(COMMONBIN)\$/xhp_${module}_LANGUAGE.zip
 LAD
     
     $linklinkfiles = '';
@@ -230,12 +230,12 @@ LAD
     
     $linkaddedfiles = <<"LAF";
    -add $module.cfg \$(PRJ)\$/source\$/auxiliary\$/LANGUAGE\$/$module.cfg \\
-   -add $module.jar  \$(BIN)\$/xhp_${module}_LANGUAGE.zip
+   -add $module.jar  \$(COMMONBIN)\$/xhp_${module}_LANGUAGE.zip
 LAF
     
     $linkaddeddeps = <<"LAD";
    \$(PRJ)\$/source\$/auxiliary\$/LANGUAGE\$/$module.cfg \\
-   \$(BIN)\$/xhp_${module}_LANGUAGE.zip
+   \$(COMMONBIN)\$/xhp_${module}_LANGUAGE.zip
 LAD
     
     $linklinkfiles = '';
@@ -258,7 +258,7 @@ LAD
     
     $linkaddedfiles = <<"LAF";
    -add $module.tree \$(COMMONMISC)\$/LANGUAGE\$/$module.tree \\
-   -add $module.jar  \$(BIN)\$/xhp_${module}_LANGUAGE.zip \\
+   -add $module.jar  \$(COMMONBIN)\$/xhp_${module}_LANGUAGE.zip \\
    -add default.css  \$(PRJ)\$/source\$/auxiliary\$/LANGUAGE\$/default.css \\
    -add highcontrast1.css  \$(PRJ)\$/source\$/auxiliary\$/LANGUAGE\$/highcontrast1.css \\
    -add highcontrast2.css  \$(PRJ)\$/source\$/auxiliary\$/LANGUAGE\$/highcontrast2.css \\
@@ -269,7 +269,7 @@ LAF
     
     $linkaddeddeps = <<"LAD";
    \$(COMMONMISC)\$/LANGUAGE\$/$module.tree \\
-   \$(BIN)\$/xhp_${module}_LANGUAGE.zip \\
+   \$(COMMONBIN)\$/xhp_${module}_LANGUAGE.zip \\
    \$(PRJ)\$/source\$/auxiliary\$/LANGUAGE\$/default.css \\
    \$(PRJ)\$/source\$/auxiliary\$/LANGUAGE\$/highcontrast1.css \\
    \$(PRJ)\$/source\$/auxiliary\$/LANGUAGE\$/highcontrast2.css \\
@@ -294,13 +294,13 @@ LAD
     $linkaddedfiles = <<"LAF";
    -add $module.cfg \$(PRJ)\$/source\$/auxiliary\$/LANGUAGE\$/$module.cfg \\
    -add $module.tree \$(COMMONMISC)\$/LANGUAGE\$/$module.tree \\
-   -add $module.jar  \$(BIN)\$/xhp_${module}_LANGUAGE.zip
+   -add $module.jar  \$(COMMONBIN)\$/xhp_${module}_LANGUAGE.zip
 LAF
     
     $linkaddeddeps = <<"LAD";
    \$(PRJ)\$/source\$/auxiliary\$/LANGUAGE\$/$module.cfg \\
    \$(COMMONMISC)\$/LANGUAGE\$/$module.tree \\
-   \$(BIN)\$/xhp_${module}_LANGUAGE.zip
+   \$(COMMONBIN)\$/xhp_${module}_LANGUAGE.zip
 LAD
     
     $linklinkfiles = '';
@@ -324,13 +324,13 @@ LAD
     $linkaddedfiles = <<"LAF";
    -add $module.cfg \$(PRJ)\$/source\$/auxiliary\$/LANGUAGE\$/$module.cfg \\
    -add $module.tree \$(COMMONMISC)\$/LANGUAGE\$/$module.tree \\
-   -add $module.jar  \$(BIN)\$/xhp_${module}_LANGUAGE.zip
+   -add $module.jar  \$(COMMONBIN)\$/xhp_${module}_LANGUAGE.zip
 LAF
     
     $linkaddeddeps = <<"LAD";
    \$(PRJ)\$/source\$/auxiliary\$/LANGUAGE\$/$module.cfg \\
    \$(COMMONMISC)\$/LANGUAGE\$/$module.tree \\
-   \$(BIN)\$/xhp_${module}_LANGUAGE.zip
+   \$(COMMONBIN)\$/xhp_${module}_LANGUAGE.zip
 LAD
     
     $linklinkfiles = '';
@@ -351,13 +351,13 @@ LAD
     $linkaddedfiles = <<"LAF";
    -add $module.cfg \$(PRJ)\$/source\$/auxiliary\$/LANGUAGE\$/$module.cfg \\
    -add $module.tree \$(COMMONMISC)\$/LANGUAGE\$/$module.tree \\
-   -add $module.jar  \$(BIN)\$/xhp_${module}_LANGUAGE.zip
+   -add $module.jar  \$(COMMONBIN)\$/xhp_${module}_LANGUAGE.zip
 LAF
     
     $linkaddeddeps = <<"LAD";
    \$(PRJ)\$/source\$/auxiliary\$/LANGUAGE\$/$module.cfg \\
    \$(COMMONMISC)\$/LANGUAGE\$/$module.tree \\
-   \$(BIN)\$/xhp_${module}_LANGUAGE.zip
+   \$(COMMONBIN)\$/xhp_${module}_LANGUAGE.zip
 LAD
     
     $linklinkfiles = '';
@@ -377,12 +377,12 @@ LAD
     
     $linkaddedfiles = <<"LAF";
    -add $module.cfg \$(PRJ)\$/source\$/auxiliary\$/LANGUAGE\$/$module.cfg \\
-   -add $module.jar  \$(BIN)\$/xhp_${module}_LANGUAGE.zip
+   -add $module.jar  \$(COMMONBIN)\$/xhp_${module}_LANGUAGE.zip
 LAF
     
     $linkaddeddeps = <<"LAD";
    \$(PRJ)\$/source\$/auxiliary\$/LANGUAGE\$/$module.cfg \\
-   \$(BIN)\$/xhp_${module}_LANGUAGE.zip
+   \$(COMMONBIN)\$/xhp_${module}_LANGUAGE.zip
 LAD
     
     $linklinkfiles = '';
diff --git a/helpcontent2/helpers/linkmakefile.template b/helpcontent2/helpers/linkmakefile.template
index 4519ec2979..e39d37fe3b 100644
--- a/helpcontent2/helpers/linkmakefile.template
+++ b/helpcontent2/helpers/linkmakefile.template
@@ -39,7 +39,7 @@ TARGET  = util_%module%
 .INCLUDE : settings.mk
 .INCLUDE : $(PRJ)$/settings.pmk
 
-common_build_zip:=
+#common_build_zip:=
 zip1generatedlangs=TRUE
 zip1langdirs=$(aux_alllangiso)
 ZIP1TARGET=xhp_%module%