[vlc-commits] NSIS: improve the installation of folders

[Daniel Amm]

vlc | branch: master | Daniel Amm <da2424 at t-online.de> | Fri Jan 22 19:01:51 2016 +0100| [772f474128b57e3b96567f68275c492e8a5fe974] | committer: Jean-Baptiste Kempf

NSIS: improve the installation of folders

Do not search for all matching folders/files, but only the specified folder.

Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=772f474128b57e3b96567f68275c492e8a5fe974
---

 extras/package/win32/NSIS/helpers/install.nsh |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/extras/package/win32/NSIS/helpers/install.nsh b/extras/package/win32/NSIS/helpers/install.nsh
index 68adb79..e856b1e 100644
--- a/extras/package/win32/NSIS/helpers/install.nsh
+++ b/extras/package/win32/NSIS/helpers/install.nsh
@@ -30,7 +30,9 @@
 !macroend
 
 !macro InstallFolder FOLDER
-  File /r /x sdk "${FOLDER}"
+  SetOutPath "$INSTDIR\${FOLDER}"
+  File /r "${FOLDER}\*.*"
+  SetOutPath "$INSTDIR"
   Push "${FOLDER}"
   Call InstallFolderInternal
 !macroend