[Libreoffice-commits] .: 3 commits - Makefile.in solenv/inc

[Tor Lillqvist]

 Makefile.in            |    3 ++-
 solenv/inc/settings.mk |    2 ++
 solenv/inc/target.mk   |    2 +-
 3 files changed, 5 insertions(+), 2 deletions(-)

New commits:
commit 78d55f9fb734b1c4bc2c732951a3a8ac882775d0
Author: Tor Lillqvist <tml at iki.fi>
Date:   Tue Jun 7 00:41:50 2011 +0300

    We put JARFILES in the HOST bin directory, not the BUILD one
    
    So look for them there.

diff --git a/solenv/inc/target.mk b/solenv/inc/target.mk
index 8665624..ed4a7b9 100644
--- a/solenv/inc/target.mk
+++ b/solenv/inc/target.mk
@@ -206,7 +206,7 @@ DEPIDLFILES:=$(foreach,i,$(IDLFILES) $(!null,$(shell @$(FIND) . -name $i -print)
 .IF "$(JARFILES)"!=""
 LOCALJARS:=$(foreach,i,$(shell @@-cd $(JARDIR) && ls -1 $(JARFILES) ) $(JARDIR)/$i)
 NEWCLASS:=$(LOCALJARS)
-NEWCLASS+:=$(foreach,i,$(JARFILES) $(eq,$(LOCALJARS),$(subst,$i, $(LOCALJARS)) $(SOLARBINDIR)/$i $(NULL)))
+NEWCLASS+:=$(foreach,i,$(JARFILES) $(eq,$(LOCALJARS),$(subst,$i, $(LOCALJARS)) $(SOLARVERSION)$/$(INPATH)$/bin$/$i $(NULL)))
 .ENDIF			# "$(JARFILES)"!=""
 NEWCLASS+=$(EXTRAJARFILES)
 .IF "$(GENJAVACLASSFILES)"!=""
commit a86b426a2340c9e4ae1b76130d0c1bdc1ade1b68
Author: Tor Lillqvist <tml at iki.fi>
Date:   Tue Jun 7 00:00:49 2011 +0300

    Add FOR_BUILD versions of OUT and LOCAL_OUT

diff --git a/solenv/inc/settings.mk b/solenv/inc/settings.mk
index e3036c7..d3e75a9 100644
--- a/solenv/inc/settings.mk
+++ b/solenv/inc/settings.mk
@@ -538,6 +538,7 @@ ROUT=$(OUTPATH).cap
 
 .IF "$(product)"!=""
 OUT=$(PRJ)/$(OUTPATH).pro
+OUT_FOR_BUILD=$(PRJ)/$(OUTPATH_FOR_BUILD).pro
 ROUT=$(OUTPATH).pro
 
 .ELSE
@@ -601,6 +602,7 @@ COMMON_OUTDIR:=$(OUTPATH)
 #.ENDIF			# "$(common_build)"!=""
 
 LOCAL_OUT:=$(OUT)
+LOCAL_OUT_FOR_BUILD:=$(OUT_FOR_BUILD)
 LOCAL_COMMON_OUT:=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(OUT))
 .EXPORT : LOCAL_OUT LOCAL_COMMON_OUT
 
commit 0a0d870cc800f0ea3ca208c9aeec98a84d80bc8e
Author: Tor Lillqvist <tml at iki.fi>
Date:   Tue Jun 7 00:00:13 2011 +0300

    Add dictionaries to cross-build-toolset

diff --git a/Makefile.in b/Makefile.in
index 876b81e..62f8da8 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -28,7 +28,8 @@ cross-build-toolset:
 	(cd codemaker && build.pl $(GBUILD_OPT) -P at BUILD_NCPUS@ -- -P at BUILD_MAX_JOBS@ && deliver.pl) && \
 	(cd ridljar && build.pl $(GBUILD_OPT) -P at BUILD_NCPUS@ -- -P at BUILD_MAX_JOBS@ && deliver.pl) && \
 	(cd glib && build.pl $(GBUILD_OPT) -P at BUILD_NCPUS@ -- -P at BUILD_MAX_JOBS@ && deliver.pl) && \
-	(cd gettext && build.pl $(GBUILD_OPT) -P at BUILD_NCPUS@ -- -P at BUILD_MAX_JOBS@ && deliver.pl)
+	(cd gettext && build.pl $(GBUILD_OPT) -P at BUILD_NCPUS@ -- -P at BUILD_MAX_JOBS@ && deliver.pl) && \
+	(cd dictionaries && build.pl $(GBUILD_OPT) -P at BUILD_NCPUS@ -- -P at BUILD_MAX_JOBS@)
 endif
 
 install: