[Libreoffice-commits] .: 2 commits - sdext/Extension_presenter.mk solenv/gbuild

[David Tardon]

 sdext/Extension_presenter.mk |    4 +---
 solenv/gbuild/Extension.mk   |    2 +-
 2 files changed, 2 insertions(+), 4 deletions(-)

New commits:
commit ac488d581a06fadb8866f6612595fe93b120c8fb
Author: David Tardon <dtardon at redhat.com>
Date:   Thu Mar 8 19:01:24 2012 +0100

    quick hack to fix building sdext with l10n

diff --git a/solenv/gbuild/Extension.mk b/solenv/gbuild/Extension.mk
index 9fcaa33..3bfc6b5 100644
--- a/solenv/gbuild/Extension.mk
+++ b/solenv/gbuild/Extension.mk
@@ -183,7 +183,7 @@ endef
 
 define gb_Extension_localize_help_onelang
 $(call gb_Extension_get_target,$(1)) : $(call gb_Extension_get_rootdir,$(1))/$(2)
-$(call gb_Extension_get_rootdir,$(1))/$(2) : SDF := $(gb_SDFLOCATION)$(subst $(SRCDIR),,$(dir $(3)))localize.sdf
+$(call gb_Extension_get_rootdir,$(1))/$(2) : SDF := $(gb_SDFLOCATION)$(subst $(SRCDIR),,$(subst $(WORKDIR)/CustomTarget,,$(dir $(3))))localize.sdf
 $(call gb_Extension_get_rootdir,$(1))/$(2) : $$(SDF)
 $(call gb_Extension_get_rootdir,$(1))/$(2) : $(gb_Extension_HELPEXTARGET)
 $(call gb_Extension_get_rootdir,$(1))/$(2) : $(3)
commit de9f94dc8f3be28f11881e036ce0680988fb1666
Author: David Tardon <dtardon at redhat.com>
Date:   Thu Mar 8 19:00:43 2012 +0100

    beware of excessive white spaces

diff --git a/sdext/Extension_presenter.mk b/sdext/Extension_presenter.mk
index 0b228a2..3fa9806 100644
--- a/sdext/Extension_presenter.mk
+++ b/sdext/Extension_presenter.mk
@@ -147,9 +147,7 @@ $(eval $(call gb_Extension_add_files,presenter-screen,help/en-US/com.sun.Present
     $(WORKDIR)/CustomTarget/sdext/source/presenter/help/en-US/com.sun.PresenterScreen/presenter.xhp \
 ))
 
-$(eval $(call gb_Extension_localize_help,presenter-screen,\
-    help/lang/com.sun.PresenterScreen-$(sdext_PLATFORM)/presenter.xhp,\
-    $(WORKDIR)/CustomTarget/sdext/source/presenter/help/en-US/com.sun.PresenterScreen/presenter.xhp))
+$(eval $(call gb_Extension_localize_help,presenter-screen,help/lang/com.sun.PresenterScreen-$(sdext_PLATFORM)/presenter.xhp,$(WORKDIR)/CustomTarget/sdext/source/presenter/help/en-US/com.sun.PresenterScreen/presenter.xhp))
 
 # this file is created by a custom target, but we depend on it: ensure
 # make knows about it