[Libreoffice-commits] .: i18npool/CustomTarget_localedata.mk

2012-05-30 Thread Matus Kukan 
 i18npool/CustomTarget_localedata.mk |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit af1fe5e603b8fff6b35a759d9c558f6a49638e2e
Author: Matúš Kukan matus.ku...@gmail.com
Date:   Wed May 30 12:20:48 2012 +0200

i18npool: depend on outdir target

Change-Id: Ib94620f316899a77b3842989dd859625f6748ddc

diff --git a/i18npool/CustomTarget_localedata.mk 
b/i18npool/CustomTarget_localedata.mk
index 37c9474..d8c260d 100644
--- a/i18npool/CustomTarget_localedata.mk
+++ b/i18npool/CustomTarget_localedata.mk
@@ -54,7 +54,7 @@ $(i18npool_LDDIR)/saxparser.rdb : 
$(i18npool_LDDIR)/saxparser.input \
$(gb_XSLTPROC) --nonet --stringparam prefix 
$(OUTDIR_FOR_BUILD)/xml/ \
-o $@ $(SOLARENV)/bin/packcomponents.xslt $)
 
-$(i18npool_LDDIR)/saxparser.input : $(call 
gb_ComponentTarget_get_target,sax/source/expatwrap/expwrap) | 
$(i18npool_LDDIR)/.dir
+$(i18npool_LDDIR)/saxparser.input : $(call 
gb_ComponentTarget_get_outdir_target,sax/source/expatwrap/expwrap) | 
$(i18npool_LDDIR)/.dir
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ECH,1)
echo 
'listfilenamecomponent/sax/source/expatwrap/expwrap.component/filename/list'
  $@
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: i18npool/CustomTarget_localedata.mk solenv/gbuild

2012-03-24 Thread Matus Kukan 
 i18npool/CustomTarget_localedata.mk|2 +-
 solenv/gbuild/platform/com_GCC_defs.mk |1 +
 solenv/gbuild/platform/windows.mk  |1 +
 3 files changed, 3 insertions(+), 1 deletion(-)

New commits:
commit 4352326b6bd54805649961073ffea6dc41a66ed8
Author: Matúš Kukan matus.ku...@gmail.com
Date:   Sun Mar 25 00:18:13 2012 +0100

fix windows build, properly set LO_LIB_DIR

diff --git a/i18npool/CustomTarget_localedata.mk 
b/i18npool/CustomTarget_localedata.mk
index bd52876..48b611e 100644
--- a/i18npool/CustomTarget_localedata.mk
+++ b/i18npool/CustomTarget_localedata.mk
@@ -44,7 +44,7 @@ $(IPLD)/localedata_%.cxx : 
$(SRCDIR)/i18npool/source/localedata/data/%.xml \
$(call gb_Helper_abbreviate_dirs_native, \
$(call gb_Helper_execute,saxparser) $* $ $@.tmp \
$(my_file)$(IPLD)/saxparser.rdb 
$(OUTDIR_FOR_BUILD)/bin/types.rdb \
-   -env:LO_LIB_DIR=$(my_file)$(OUTDIR_FOR_BUILD)/lib \
+   
-env:LO_LIB_DIR=$(my_file)$(gb_Helper_OUTDIR_FOR_BUILDLIBDIR) \
$(if $(findstring s,$(MAKEFLAGS)), /dev/null 21)  \
sed 's/\(^.*get[^;]*$$\)/SAL_DLLPUBLIC_EXPORT \1/' $@.tmp  $@ 
 \
rm $@.tmp)
diff --git a/solenv/gbuild/platform/com_GCC_defs.mk 
b/solenv/gbuild/platform/com_GCC_defs.mk
index e760d9e..4018ebc 100644
--- a/solenv/gbuild/platform/com_GCC_defs.mk
+++ b/solenv/gbuild/platform/com_GCC_defs.mk
@@ -175,6 +175,7 @@ $(1)
 endef
 
 gb_Helper_OUTDIRLIBDIR := $(OUTDIR)/lib
+gb_Helper_OUTDIR_FOR_BUILDLIBDIR := $(OUTDIR_FOR_BUILD)/lib
 
 gb_Helper_abbreviate_dirs_native = $(gb_Helper_abbreviate_dirs)
 
diff --git a/solenv/gbuild/platform/windows.mk 
b/solenv/gbuild/platform/windows.mk
index 59c23be..b09e4be 100644
--- a/solenv/gbuild/platform/windows.mk
+++ b/solenv/gbuild/platform/windows.mk
@@ -28,6 +28,7 @@
 GUI := WNT
 
 gb_Helper_OUTDIRLIBDIR := $(OUTDIR)/bin
+gb_Helper_OUTDIR_FOR_BUILDLIBDIR := $(OUTDIR_FOR_BUILD)/bin
 
 gb_Helper_get_rcfile = $(1).ini
 
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits