[ooo-build-commit] Branch 'ooo/master' - migrationanalysis/prj migrationanalysis/src swext/mediawiki

[Jan Holesovsky]

 migrationanalysis/prj/build.lst          |    2 +-
 migrationanalysis/src/wizard/makefile.mk |    2 +-
 swext/mediawiki/help/makefile.mk         |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 91619b23bf508a342d2babf79cc0d07b540e6740
Author: Ivo Hinkelmann <ihi at openoffice.org>
Date:   Tue Jun 16 18:11:49 2009 +0000

    CWS-TOOLING: integrate CWS ause102
    2009-06-16 19:22:59 +0200 hjs  r273039 : #i102607# don't kill mingw
    2009-06-12 15:17:22 +0200 ihi  r272921 : #i102607# add path before calling l10n tool
    2009-06-11 14:25:20 +0200 hjs  r272873 : #i102607# on EPM=internal call binary with full path
    2009-06-10 13:35:48 +0200 hjs  r272807 : #i102607# remove solver PATH entry from OOo env.
    2009-06-10 12:10:44 +0200 hjs  r272802 : #i102635# correct dependencies for all
    2009-06-10 11:58:53 +0200 hjs  r272801 : #i102607# call tools from solver with absolute path

diff --git a/migrationanalysis/prj/build.lst b/migrationanalysis/prj/build.lst
index 19b8893..37f2413 100644
--- a/migrationanalysis/prj/build.lst
+++ b/migrationanalysis/prj/build.lst
@@ -1,4 +1,4 @@
-at  migrationanalysis   :   soltools NULL
+at  migrationanalysis   :   soltools shell NULL
 at	migrationanalysis\src\msokill           nmake    -  w  at_src NULL
 at  migrationanalysis\src\driver_docs       nmake    -  w  at_src_driver NULL
 at  migrationanalysis\src\resources         nmake    -  w  at_src_resources NULL
diff --git a/migrationanalysis/src/wizard/makefile.mk b/migrationanalysis/src/wizard/makefile.mk
index 38aaa38..eee2461 100644
--- a/migrationanalysis/src/wizard/makefile.mk
+++ b/migrationanalysis/src/wizard/makefile.mk
@@ -110,7 +110,7 @@ $(PAW_LAUNCHER) : $(ALTERNATE_SRC)$/$$(@:f)
 # using lngconvex.exe 
 
 $(RCFILES) : $(MANIFEST) $(ULFDIR)$/$(TARGET).ulf makefile.mk rcfooter.txt rcheader.txt rctmpl.txt
-    $(WRAPCMD) lngconvex.exe -ulf $(ULFDIR)$/$(TARGET).ulf -rc $(RES)$/$(TARGET).rc -rct rctmpl.txt -rch rcheader.txt -rcf rcfooter.txt
+    $(LNGCONVEX) -ulf $(ULFDIR)$/$(TARGET).ulf -rc $(RES)$/$(TARGET).rc -rct rctmpl.txt -rch rcheader.txt -rcf rcfooter.txt
 
 $(PAW_RES_DLLS) : $(RCFILES)
     -$(MKDIRHIER) $(@:d)
diff --git a/swext/mediawiki/help/makefile.mk b/swext/mediawiki/help/makefile.mk
index eb395ca..25568fd 100644
--- a/swext/mediawiki/help/makefile.mk
+++ b/swext/mediawiki/help/makefile.mk
@@ -72,6 +72,6 @@ $(OUT_HELP)$/{$(MEDIAWIKI_LANG)}$/$(PACKAGE)$/%.xhp :| %.xhp
 
 
 $(OUT_MEDIAWIKI)$/$(TARGET).done : localize.sdf $(XHPFILES) $(HLANGXHPFILES)
-    @$(AUGMENT_LIBRARY_PATH) $(WRAPCMD) helpex -QQ -p $(PRJNAME) -r $(PRJ) -i @$(mktmp $(uniq $(foreach,i,$? $(!eq,$(i:f),$(i:f:s/.xhp//) $(i:f) $(XHPFILES))))) -x $(OUT_HELP) -y $(PACKAGE) -l all -lf $(MEDIAWIKI_LANG:t",") -m localize.sdf && $(TOUCH) $@
+    @$(HELPEX) -QQ -p $(PRJNAME) -r $(PRJ) -i @$(mktmp $(uniq $(foreach,i,$? $(!eq,$(i:f),$(i:f:s/.xhp//) $(i:f) $(XHPFILES))))) -x $(OUT_HELP) -y $(PACKAGE) -l all -lf $(MEDIAWIKI_LANG:t",") -m localize.sdf && $(TOUCH) $@
 .ENDIF