From 5e10c8d2b44f38df0a1a805f4ad6b6610eabecdf Mon Sep 17 00:00:00 2001
From: David Tardon <dtardon@redhat.com>
Date: Wed, 13 Feb 2013 10:59:09 +0100
Subject: [PATCH] fdo#60386 fix l10n of windows shell extension

Change-Id: I5b4b839b930c294bee6727402dbc47efee7fbcd7
---
 shell/CustomTarget_shlxthdl_res.mk | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/shell/CustomTarget_shlxthdl_res.mk b/shell/CustomTarget_shlxthdl_res.mk
index 6a07701154ea..2885176b52ec 100644
--- a/shell/CustomTarget_shlxthdl_res.mk
+++ b/shell/CustomTarget_shlxthdl_res.mk
@@ -27,14 +27,19 @@
 
 $(eval $(call gb_CustomTarget_CustomTarget,shell/source/win32/shlxthandler/res))
 
+$(eval $(call gb_CustomTarget_register_targets,shell/source/win32/shlxthandler/res,\
+	shlxthdl.ulf \
+	shlxthdl_impl.rc \
+))
+
 $(call gb_CustomTarget_get_target,shell/source/win32/shlxthandler/res) : \
 	$(call gb_CustomTarget_get_workdir,shell/source/win32/shlxthandler/res)/shlxthdl_impl.rc
 
 $(call gb_CustomTarget_get_workdir,shell/source/win32/shlxthandler/res)/shlxthdl_impl.rc : \
+	$(call gb_CustomTarget_get_workdir,shell/source/win32/shlxthandler/res)/shlxthdl.ulf \
 	$(SRCDIR)/shell/source/win32/shlxthandler/res/rcfooter.txt \
 	$(SRCDIR)/shell/source/win32/shlxthandler/res/rcheader.txt \
 	$(SRCDIR)/shell/source/win32/shlxthandler/res/rctmpl.txt \
-	$(SRCDIR)/shell/source/win32/shlxthandler/res/shlxthdl.ulf \
 	$(call gb_Executable_get_runtime_dependencies,lngconvex) \
 	| $(call gb_CustomTarget_get_workdir,shell/source/win32/shlxthandler/res)/.dir
 
@@ -44,10 +49,18 @@ $(call gb_CustomTarget_get_workdir,shell/source/win32/shlxthandler/res)/shlxthdl
 		cd $(SRCDIR)/shell/source/win32/shlxthandler/res && \
 		BRAND_BASE_DIR=$(call gb_Helper_make_url,$(OUTDIR)/unittest/install) \
 		$(call gb_Executable_get_command,lngconvex) \
-			-ulf shlxthdl.ulf \
+			-ulf $< \
 			-rc $@ \
 			-rct rctmpl.txt \
 			-rch rcheader.txt \
 			-rcf rcfooter.txt)
 
+$(call gb_CustomTarget_get_workdir,shell/source/win32/shlxthandler/res)/shlxthdl.ulf : \
+		$(SRCDIR)/shell/source/win32/shlxthandler/res/shlxthdl.ulf \
+		$(call gb_Executable_get_runtime_dependencies,ulfex)
+	MERGEINPUT=`$(gb_MKTEMP)` && \
+	echo $(foreach lang,$(gb_TRANS_LANGS),$(gb_POLOCATION)/$(lang)/$(patsubst %/,%,$(subst $(SRCDIR)/,,$(dir $<))).po) > $${MERGEINPUT} && \
+	$(call gb_Executable_get_command,ulfex) -p shell -i $< -o $@ -m $${MERGEINPUT} -l all && \
+	rm -f $${MERGEINPUT}
+
 # vim: set shiftwidth=4 tabstop=4 noexpandtab: