Date: prev next · Thread: first prev next last
2013 Archives by date, by thread · List index


Hi,

I have submitted a patch for review:

    https://gerrit.libreoffice.org/3593

To pull it, you can do:

    git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/93/3593/1

allow out-of-srctree builds on windows

config_host (config_$(gb_Side) dir was included from SRCDIR, but when
runing the build in another directory, it is in BUILDDIR
WinResTarget.mk was forgotten when the other references were updated in
ae4e327739112ba326a2945fc0d5550739f3083d and follow-up ones.

Change-Id: I8c5a8edb4a17dd33abdcdb04c3af830cad44e07a
---
M solenv/gbuild/WinResTarget.mk
1 file changed, 2 insertions(+), 2 deletions(-)



diff --git a/solenv/gbuild/WinResTarget.mk b/solenv/gbuild/WinResTarget.mk
index d88375e..bb59d24 100644
--- a/solenv/gbuild/WinResTarget.mk
+++ b/solenv/gbuild/WinResTarget.mk
@@ -16,7 +16,7 @@
 
 define gb_WinResTarget_WinResTarget_init
 $(call gb_WinResTarget_get_target,$(1)) : DEFS := $(gb_WinResTarget_DEFAULTDEFS)
-$(call gb_WinResTarget_get_target,$(1)) : INCLUDE := $(subst -isystem,-I,$(SOLARINC)) 
-I$(SRCDIR)/config_$(gb_Side)
+$(call gb_WinResTarget_get_target,$(1)) : INCLUDE := $(subst -isystem,-I,$(SOLARINC)) 
-I$(BUILDDIR)/config_$(gb_Side)
 $(call gb_WinResTarget_get_clean_target,$(1)) : RCFILE :=
 $(call gb_WinResTarget_get_target,$(1)) : RCFILE :=
 
@@ -24,7 +24,7 @@
 
 ifeq ($(gb_FULLDEPS),$(true))
 $(call gb_WinResTarget_get_dep_target,$(1)) : DEFS := $$(gb_WinResTarget_DEFAULTDEFS)
-$(call gb_WinResTarget_get_dep_target,$(1)) : INCLUDE := $$(gb_WinResTarget_INCLUDE) 
-I$(SRCDIR)/config_$(gb_Side)
+$(call gb_WinResTarget_get_dep_target,$(1)) : INCLUDE := $$(gb_WinResTarget_INCLUDE) 
-I$(BUILDDIR)/config_$(gb_Side)
 $(call gb_WinResTarget_get_dep_target,$(1)) : RCFILE :=
 
 -include $(call gb_WinResTarget_get_dep_target,$(1))

-- 
To view, visit https://gerrit.libreoffice.org/3593
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I8c5a8edb4a17dd33abdcdb04c3af830cad44e07a
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>


Context


Privacy Policy | Impressum (Legal Info) | Copyright information: Unless otherwise specified, all text and images on this website are licensed under the Creative Commons Attribution-Share Alike 3.0 License. This does not include the source code of LibreOffice, which is licensed under the Mozilla Public License (MPLv2). "LibreOffice" and "The Document Foundation" are registered trademarks of their corresponding registered owners or are in actual use as trademarks in one or more countries. Their respective logos and icons are also subject to international copyright laws. Use thereof is explained in our trademark policy.