From 670660b30559eed277df7ee19296d8f224e84282 Mon Sep 17 00:00:00 2001
From: Ludovic Fauvet <etix@videolan.org>
Date: Tue, 9 Apr 2013 19:58:16 +0200
Subject: [PATCH] msi: simplification

Directly assign the given subdirectories to the application folder.
---
 extras/package/win32/msi.mak         | 8 ++++----
 extras/package/win32/msi/product.wxs | 4 ----
 2 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/extras/package/win32/msi.mak b/extras/package/win32/msi.mak
index 31d141fa50..d13ef78f54 100644
--- a/extras/package/win32/msi.mak
+++ b/extras/package/win32/msi.mak
@@ -18,10 +18,10 @@ WINE_C=`winepath c:`
 package-msi: heat candle light
 
 heat: package-win-strip
-	$(HEAT) dir $(VLCDIR)/plugins -cg CompPluginsGroup -gg -scom -sreg -sfrag -srd -dr PLUGINSDIR -out $(W_MSIBUILDDIR)/Plugins.fragment.wxs
-	$(HEAT) dir $(VLCDIR)/locale -cg CompLocaleGroup -gg -scom -sreg -sfrag -srd -dr LOCALEDIR -out $(W_MSIBUILDDIR)/Locale.fragment.wxs
-	$(HEAT) dir $(VLCDIR)/lua -cg CompLuaGroup -gg -scom -sreg -sfrag -srd -dr LUADIR -out $(W_MSIBUILDDIR)/Lua.fragment.wxs
-	$(HEAT) dir $(VLCDIR)/skins -cg CompSkinsGroup -gg -scom -sreg -sfrag -srd -dr SKINSDIR -out $(W_MSIBUILDDIR)/Skins.fragment.wxs
+	$(HEAT) dir $(VLCDIR)/plugins -cg CompPluginsGroup -gg -scom -sreg -sfrag -dr APPLICATIONFOLDER -out $(W_MSIBUILDDIR)/Plugins.fragment.wxs
+	$(HEAT) dir $(VLCDIR)/locale -cg CompLocaleGroup -gg -scom -sreg -sfrag -dr APPLICATIONFOLDER -out $(W_MSIBUILDDIR)/Locale.fragment.wxs
+	$(HEAT) dir $(VLCDIR)/lua -cg CompLuaGroup -gg -scom -sreg -sfrag -dr APPLICATIONFOLDER -out $(W_MSIBUILDDIR)/Lua.fragment.wxs
+	$(HEAT) dir $(VLCDIR)/skins -cg CompSkinsGroup -gg -scom -sreg -sfrag -dr APPLICATIONFOLDER -out $(W_MSIBUILDDIR)/Skins.fragment.wxs
 
 candle:
 	$(am__cd) $(MSIBUILDDIR) && $(CANDLE) -arch $(WINDOWS_ARCH) -ext WiXUtilExtension $(W_MSIDIR)\\product.wxs $(W_MSIDIR)\\axvlc.wxs $(W_MSIDIR)\\extensions.wxs $(W_MSIBUILDDIR)\\*.fragment.wxs
diff --git a/extras/package/win32/msi/product.wxs b/extras/package/win32/msi/product.wxs
index 6d7ac7876c..be2a6d3a2a 100644
--- a/extras/package/win32/msi/product.wxs
+++ b/extras/package/win32/msi/product.wxs
@@ -151,10 +151,6 @@
                                 <RemoveFile Id="RemovePluginsCache" Name="plugins.dat" On="uninstall" />
                             </Component>
                         </Directory>
-                        <Directory Id='LOCALEDIR' Name='locale' />
-                        <Directory Id='LUADIR' Name='lua' />
-                        <!-- <Directory Id='OSDMENUDIR' Name='osdmenu' /> -->
-                        <Directory Id='SKINSDIR' Name='skins' />
 
                         <Component Id='CompPlayDiscs' Guid='b0d90296-b20c-4c74-a3b3-a7694e011f25' Win64="$(var.Win64)">
                             <!-- Audio CD -->
-- 
2.39.2