From e7954e7c7362acea606fa46f349b143ce4b1080f Mon Sep 17 00:00:00 2001
From: Simon Rozman <simon@rozman.si>
Date: Tue, 11 Feb 2020 11:55:37 +0100
Subject: [PATCH] MSI: Automate language-dependent folder property names

Signed-off-by: Simon Rozman <simon@rozman.si>
---
 Updater/MSIBuild/Makefile | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/Updater/MSIBuild/Makefile b/Updater/MSIBuild/Makefile
index 9c6ca4f..2fdcdc6 100644
--- a/Updater/MSIBuild/Makefile
+++ b/Updater/MSIBuild/Makefile
@@ -23,6 +23,10 @@
 !ERROR Parameter MSIBUILD_LANGID is undefined.
 !ENDIF
 
+!IFNDEF MSIBUILD_LANG_GUID
+!ERROR Parameter MSIBUILD_LANG_GUID is undefined.
+!ENDIF
+
 !IFNDEF UPDATER_LOC_DIR
 !ERROR Parameter UPDATER_LOC_DIR is undefined.
 !ENDIF
@@ -40,10 +44,10 @@ Component	ComponentId	Directory_	Attributes	Condition	KeyPath
 s$(MSIBUILD_LENGTH_ID)	S38	s$(MSIBUILD_LENGTH_ID)	i2	S255	S$(MSIBUILD_LENGTH_ID)
 Component	Component
 !IF "$(LANG)" == "ru_RU"
-compUpdater.mo.ru_RU	{486A9DDF-A43B-4920-BEF9-2907DD8660AD}	UPDATERLOCRURUDIR	$(MSIBUILD_COMPONENT_ATTRIB_FILE)		fileUpdater.mo.ru_RU
+compUpdater.mo.ru_RU	{486A9DDF-A43B-4920-BEF9-2907DD8660AD}	UPDATERLOC$(MSIBUILD_LANG_GUID)DIR	$(MSIBUILD_COMPONENT_ATTRIB_FILE)		fileUpdater.mo.ru_RU
 !ENDIF
 !IF "$(LANG)" == "sl_SI"
-compUpdater.mo.sl_SI	{2A56FA39-F4E6-492F-A863-AFE9E53FA988}	UPDATERLOCSLSIDIR	$(MSIBUILD_COMPONENT_ATTRIB_FILE)		fileUpdater.mo.sl_SI
+compUpdater.mo.sl_SI	{2A56FA39-F4E6-492F-A863-AFE9E53FA988}	UPDATERLOC$(MSIBUILD_LANG_GUID)DIR	$(MSIBUILD_COMPONENT_ATTRIB_FILE)		fileUpdater.mo.sl_SI
 !ENDIF
 <<NOKEEP
 
@@ -59,11 +63,8 @@ All :: "$(LANG).$(PLAT).$(CFG).Directory-1.idt"
 Directory	Directory_Parent	DefaultDir
 s$(MSIBUILD_LENGTH_ID)	S$(MSIBUILD_LENGTH_ID)	l255
 Directory	Directory
-!IF "$(LANG)" == "ru_RU"
-UPDATERLOCRURUDIR	$(UPDATER_LOC_DIR)	ru_RU
-!ENDIF
-!IF "$(LANG)" == "sl_SI"
-UPDATERLOCSLSIDIR	$(UPDATER_LOC_DIR)	sl_SI
+!IF "$(LANG)" != "en_US"
+UPDATERLOC$(MSIBUILD_LANG_GUID)DIR	$(UPDATER_LOC_DIR)	$(LANG)
 !ENDIF
 <<NOKEEP