diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2005-02-11 13:53:19 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2005-02-11 13:53:19 +0000 |
| commit | e0e586d044a9a18073d6f0a6ce46e86b65435114 (patch) | |
| tree | ccef5bab3cc55f20d3498a36a2f91b733f3307d5 /helpcontent2/helpers | |
| parent | 13e95388484271f4f04458c11212d58bffed9102 (diff) | |
INTEGRATION: CWS ause018 (1.8.6); FILE MERGED
2005/02/07 18:56:24 hjs 1.8.6.2: #i42057# avoid zip targets for javaless builds
2005/02/04 18:17:59 hjs 1.8.6.1: #i39062# use *.tree files generated to MISC
Diffstat (limited to 'helpcontent2/helpers')
| -rw-r--r-- | helpcontent2/helpers/createmakefile.pl | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/helpcontent2/helpers/createmakefile.pl b/helpcontent2/helpers/createmakefile.pl index a667f8b5eb..f517bb12cb 100644 --- a/helpcontent2/helpers/createmakefile.pl +++ b/helpcontent2/helpers/createmakefile.pl @@ -145,13 +145,13 @@ for $d(@dirs) { $linkaddedfiles = <<"LAF"; -add $module.cfg \$(PRJ)\$/source\$/auxiliary\$/LANGUAGE\$/$module.cfg \\ - -add $module.tree \$(PRJ)\$/source\$/auxiliary\$/LANGUAGE\$/$module.tree \\ + -add $module.tree \$(MISC)\$/LANGUAGE\$/$module.tree \\ -add $module.jar \$(BIN)\$/xhp_${module}_LANGUAGE.zip LAF $linkaddeddeps = <<"LAD"; \$(PRJ)\$/source\$/auxiliary\$/LANGUAGE\$/$module.cfg \\ - \$(PRJ)\$/source\$/auxiliary\$/LANGUAGE\$/$module.tree \\ + \$(MISC)\$/LANGUAGE\$/$module.tree \\ \$(BIN)\$/xhp_${module}_LANGUAGE.zip LAD @@ -173,13 +173,13 @@ LAD $linkaddedfiles = <<"LAF"; -add $module.cfg \$(PRJ)\$/source\$/auxiliary\$/LANGUAGE\$/$module.cfg \\ - -add $module.tree \$(PRJ)\$/source\$/auxiliary\$/LANGUAGE\$/$module.tree \\ + -add $module.tree \$(MISC)\$/LANGUAGE\$/$module.tree \\ -add $module.jar \$(BIN)\$/xhp_${module}_LANGUAGE.zip LAF $linkaddeddeps = <<"LAD"; \$(PRJ)\$/source\$/auxiliary\$/LANGUAGE\$/$module.cfg \\ - \$(PRJ)\$/source\$/auxiliary\$/LANGUAGE\$/$module.tree \\ + \$(MISC)\$/LANGUAGE\$/$module.tree \\ \$(BIN)\$/xhp_${module}_LANGUAGE.zip LAD @@ -200,12 +200,12 @@ LAD $module = "schart"; $linkaddedfiles = <<"LAF"; - -add $module.tree \$(PRJ)\$/source\$/auxiliary\$/LANGUAGE\$/$module.tree \\ + -add $module.tree \$(MISC)\$/LANGUAGE\$/$module.tree \\ -add $module.jar \$(BIN)\$/xhp_${module}_LANGUAGE.zip LAF $linkaddeddeps = <<"LAD"; - \$(PRJ)\$/source\$/auxiliary\$/LANGUAGE\$/$module.tree \\ + \$(MISC)\$/LANGUAGE\$/$module.tree \\ \$(BIN)\$/xhp_${module}_LANGUAGE.zip LAD @@ -251,7 +251,7 @@ LAD $module = "shared"; $linkaddedfiles = <<"LAF"; - -add $module.tree \$(PRJ)\$/source\$/auxiliary\$/LANGUAGE\$/$module.tree \\ + -add $module.tree \$(MISC)\$/LANGUAGE\$/$module.tree \\ -add $module.jar \$(BIN)\$/xhp_${module}_LANGUAGE.zip \\ -add default.css \$(PRJ)\$/source\$/auxiliary\$/LANGUAGE\$/default.css \\ -add highcontrast1.css \$(PRJ)\$/source\$/auxiliary\$/LANGUAGE\$/highcontrast1.css \\ @@ -262,7 +262,7 @@ LAD LAF $linkaddeddeps = <<"LAD"; - \$(PRJ)\$/source\$/auxiliary\$/LANGUAGE\$/$module.tree \\ + \$(MISC)\$/LANGUAGE\$/$module.tree \\ \$(BIN)\$/xhp_${module}_LANGUAGE.zip \\ \$(PRJ)\$/source\$/auxiliary\$/LANGUAGE\$/default.css \\ \$(PRJ)\$/source\$/auxiliary\$/LANGUAGE\$/highcontrast1.css \\ @@ -287,13 +287,13 @@ LAD $linkaddedfiles = <<"LAF"; -add $module.cfg \$(PRJ)\$/source\$/auxiliary\$/LANGUAGE\$/$module.cfg \\ - -add $module.tree \$(PRJ)\$/source\$/auxiliary\$/LANGUAGE\$/$module.tree \\ + -add $module.tree \$(MISC)\$/LANGUAGE\$/$module.tree \\ -add $module.jar \$(BIN)\$/xhp_${module}_LANGUAGE.zip LAF $linkaddeddeps = <<"LAD"; \$(PRJ)\$/source\$/auxiliary\$/LANGUAGE\$/$module.cfg \\ - \$(PRJ)\$/source\$/auxiliary\$/LANGUAGE\$/$module.tree \\ + \$(MISC)\$/LANGUAGE\$/$module.tree \\ \$(BIN)\$/xhp_${module}_LANGUAGE.zip LAD @@ -317,13 +317,13 @@ LAD $linkaddedfiles = <<"LAF"; -add $module.cfg \$(PRJ)\$/source\$/auxiliary\$/LANGUAGE\$/$module.cfg \\ - -add $module.tree \$(PRJ)\$/source\$/auxiliary\$/LANGUAGE\$/$module.tree \\ + -add $module.tree \$(MISC)\$/LANGUAGE\$/$module.tree \\ -add $module.jar \$(BIN)\$/xhp_${module}_LANGUAGE.zip LAF $linkaddeddeps = <<"LAD"; \$(PRJ)\$/source\$/auxiliary\$/LANGUAGE\$/$module.cfg \\ - \$(PRJ)\$/source\$/auxiliary\$/LANGUAGE\$/$module.tree \\ + \$(MISC)\$/LANGUAGE\$/$module.tree \\ \$(BIN)\$/xhp_${module}_LANGUAGE.zip LAD @@ -344,13 +344,13 @@ LAD $linkaddedfiles = <<"LAF"; -add $module.cfg \$(PRJ)\$/source\$/auxiliary\$/LANGUAGE\$/$module.cfg \\ - -add $module.tree \$(PRJ)\$/source\$/auxiliary\$/LANGUAGE\$/$module.tree \\ + -add $module.tree \$(MISC)\$/LANGUAGE\$/$module.tree \\ -add $module.jar \$(BIN)\$/xhp_${module}_LANGUAGE.zip LAF $linkaddeddeps = <<"LAD"; \$(PRJ)\$/source\$/auxiliary\$/LANGUAGE\$/$module.cfg \\ - \$(PRJ)\$/source\$/auxiliary\$/LANGUAGE\$/$module.tree \\ + \$(MISC)\$/LANGUAGE\$/$module.tree \\ \$(BIN)\$/xhp_${module}_LANGUAGE.zip LAD @@ -388,7 +388,7 @@ LAD ($linkmakefile = $linktmpl) =~ s/%([^%]*)%/$$1/gise; # remove zip1 targets - $linkmakefile =~ s,\n(ZIP1LIST=.*)\n,\nZIP1LIST=\$(LANGDIR)\$/text\$/shared\$/explorer\$/database\$/main.xhp,gi; + $linkmakefile =~ s,\n(ZIP1LIST=.*)\n,\nZIP1LIST=\$(LANGDIR)\$/text\$/shared\$/explorer\$/database\$/main.xhp\n,gi; &writelinkmakefile($module,$linkmakefile); |