[Libreoffice-commits] .: solenv/inc

Caolán McNamara caolan at kemper.freedesktop.org
Wed Jun 8 01:28:25 PDT 2011


 solenv/inc/settings.mk |    7 +++++++
 1 file changed, 7 insertions(+)

New commits:
commit e8d443198614bf8afe87a0f7f2a3b092e5eee4fe
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Wed Jun 8 09:28:09 2011 +0100

    fix i18npool build, fill in other branches too

diff --git a/solenv/inc/settings.mk b/solenv/inc/settings.mk
index d3e75a9..6e4551e 100644
--- a/solenv/inc/settings.mk
+++ b/solenv/inc/settings.mk
@@ -533,6 +533,7 @@ TARGETTYPE=CUI
 # profile has to be first for not getting the .pro extension
 .IF "$(profile)"!=""
 OUT=$(PRJ)/$(OUTPATH).cap
+OUT_FOR_BUILD=$(PRJ)/$(OUTPATH_FOR_BUILD).cap
 ROUT=$(OUTPATH).cap
 .ELSE
 
@@ -544,15 +545,18 @@ ROUT=$(OUTPATH).pro
 .ELSE
 .IF "$(profile)"!=""
 OUT=$(PRJ)/$(OUTPATH).cap
+OUT_FOR_BUILD=$(PRJ)/$(OUTPATH_FOR_BUILD).cap
 ROUT=$(OUTPATH).cap
 .ENDIF
 .IF "$(dbcs)"!=""
 OUT=$(PRJ)/$(OUTPATH).w
+OUT_FOR_BUILD=$(PRJ)/$(OUTPATH_FOR_BUILD).w
 ROUT=$(OUTPATH).w
 .ENDIF
 # could already be set by makefile.mk
 .IF "$(OUT)" == ""
 OUT*=$(PRJ)/$(OUTPATH)
+OUT_FOR_BUILD*=$(PRJ)/$(OUTPATH_FOR_BUILD)
 ROUT*=$(OUTPATH)
 .ENDIF
 .ENDIF
@@ -560,14 +564,17 @@ ROUT*=$(OUTPATH)
 
 .IF "$(bndchk)" != ""
 OUT:=$(PRJ)/$(OUTPATH).bnd
+OUT_FOR_BUILD=$(PRJ)/$(OUTPATH_FOR_BUILD).bnd
 ROUT=$(OUTPATH).bnd
 .ENDIF
 .IF "$(truetime)" != ""
 OUT=$(PRJ)/$(OUTPATH).tt
+OUT_FOR_BUILD=$(PRJ)/$(OUTPATH_FOR_BUILD).tt
 ROUT=$(OUTPATH).tt
 .ENDIF
 .IF "$(hbtoolkit)"!=""
 OUT=$(PRJ)/$(OUTPATH).tlk
+OUT_FOR_BUILD=$(PRJ)/$(OUTPATH_FOR_BUILD).tlk
 ROUT=$(OUTPATH).tlk
 .ENDIF
 


More information about the Libreoffice-commits mailing list