dbaccess/AllLangResTarget_dbui.mk | 4 ++--
solenv/gbuild/AllLangResTarget.mk | 6 +++---
2 files changed, 5 insertions(+), 5 deletions(-)
New commits:
commit 0f8a7c476a085501364649b52ae8f1ebf757a5cf
Author: Matthias Seidel <msei...@apache.org>
AuthorDate: Tue Jun 18 10:50:07 2019 +0000
Commit: Matthias Seidel <msei...@apache.org>
CommitDate: Tue Jun 18 10:50:07 2019 +0000
i128128 - Lost translations in database wizard
Fixing double slash and wrong paths
diff --git a/dbaccess/AllLangResTarget_dbui.mk
b/dbaccess/AllLangResTarget_dbui.mk
index 829af504a246..6f6ef48e9055 100644
--- a/dbaccess/AllLangResTarget_dbui.mk
+++ b/dbaccess/AllLangResTarget_dbui.mk
@@ -126,7 +126,7 @@ $(WORKDIR)/inc/dbaccess/AutoControls.hrc :
$(SRCDIR)/dbaccess/source/ui/dlg/Auto
$(call gb_Helper_abbreviate_dirs_native, \
$(gb_SrsPartMergeTarget_TRANSEXCOMMAND) \
-p svx \
- -i $< -o $@ -m
$(gb_SrsPartMergeTarget_SDFLOCATION)/dbaccess/inc/localize.sdf -l all)
+ -i $< -o $@ -m
$(gb_SrsPartMergeTarget_SDFLOCATION)/dbaccess/source/ui/dlg/localize.sdf -l all)
$(WORKDIR)/inc/dbaccess/toolbox.hrc :
$(SRCDIR)/dbaccess/source/ui/inc/toolbox_tmpl.hrc
$(gb_SrsPartMergeTarget_SDFLOCATION)/svx/inc/localize.sdf
echo merging $@
@@ -136,7 +136,7 @@ $(WORKDIR)/inc/dbaccess/toolbox.hrc :
$(SRCDIR)/dbaccess/source/ui/inc/toolbox_t
$(call gb_Helper_abbreviate_dirs_native, \
$(gb_SrsPartMergeTarget_TRANSEXCOMMAND) \
-p svx \
- -i $< -o $@ -m
$(gb_SrsPartMergeTarget_SDFLOCATION)/dbaccess/inc/localize.sdf -l all)
+ -i $< -o $@ -m
$(gb_SrsPartMergeTarget_SDFLOCATION)/dbaccess/source/ui/inc/localize.sdf -l all)
endif
diff --git a/solenv/gbuild/AllLangResTarget.mk
b/solenv/gbuild/AllLangResTarget.mk
index 073fc981be78..8aa245bf66c9 100644
--- a/solenv/gbuild/AllLangResTarget.mk
+++ b/solenv/gbuild/AllLangResTarget.mk
@@ -27,7 +27,7 @@ gb_SrsPartMergeTarget_TRANSEXTARGET := $(call
gb_Executable_get_target,transex3)
# gb_SrsPartMergeTarget_TRANSEXPRECOMMAND is set by the platforms
gb_SrsPartMergeTarget_TRANSEXCOMMAND :=
$(gb_SrsPartMergeTarget_TRANSEXPRECOMMAND)
$(gb_SrsPartMergeTarget_TRANSEXTARGET)
-gb_SrsPartMergeTarget_SDFLOCATION := $(LOCDIR)/l10n/$(INPATH)/misc/sdf/
+gb_SrsPartMergeTarget_SDFLOCATION := $(LOCDIR)/l10n/$(INPATH)/misc/sdf
gb_SrsPartMergeTarget_REPOS := $(gb_REPOS)
define gb_SrsPartMergeTarget__command
@@ -102,8 +102,8 @@ $(call gb_SrsPartTarget_get_target,$(1)) : MERGEDFILE :=
else
$(call gb_SrsPartTarget_get_target,$(1)) : MERGEDFILE := $(call
gb_SrsPartMergeTarget_get_target,$(1))
$(call gb_SrsPartTarget_get_target,$(1)) : $(call
gb_SrsPartMergeTarget_get_target,$(1))
-$(call gb_SrsPartMergeTarget_get_target,$(1)) : SDF := $(realpath
$(gb_SrsPartMergeTarget_SDFLOCATION)$(dir $(1))localize.sdf)
-$(call gb_SrsPartMergeTarget_get_target,$(1)) : $(realpath
$(gb_SrsPartMergeTarget_SDFLOCATION)$(dir $(1))localize.sdf)
+$(call gb_SrsPartMergeTarget_get_target,$(1)) : SDF := $(realpath
$(gb_SrsPartMergeTarget_SDFLOCATION)/$(dir $(1))localize.sdf)
+$(call gb_SrsPartMergeTarget_get_target,$(1)) : $(realpath
$(gb_SrsPartMergeTarget_SDFLOCATION)/$(dir $(1))localize.sdf)
endif
endef
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
