[vlc-commits] Revert "nsis: do not look for plugins/ folder elsewhere than /plugins/"
Rafaël Carré
git at videolan.org
Thu Jan 21 20:33:46 CET 2016
vlc | branch: master | Rafaël Carré <funman at videolan.org> | Thu Jan 21 20:33:01 2016 +0100| [bbf5b54d2a861cbb33e54b07c1c192dc4c325362] | committer: Rafaël Carré
Revert "nsis: do not look for plugins/ folder elsewhere than /plugins/"
This reverts commit 9f6d6486b3fa57750bb1f2f6ed31f9f964136bff.
This conflicts with 1806cbc0576a98dc25d54d9f54b4f9cc054dee54
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=bbf5b54d2a861cbb33e54b07c1c192dc4c325362
---
extras/package/win32/NSIS/vlc.win32.nsi.in | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/extras/package/win32/NSIS/vlc.win32.nsi.in b/extras/package/win32/NSIS/vlc.win32.nsi.in
index 20f84b6..42849e0 100644
--- a/extras/package/win32/NSIS/vlc.win32.nsi.in
+++ b/extras/package/win32/NSIS/vlc.win32.nsi.in
@@ -199,7 +199,7 @@ ${MementoSection} $Name_Section01 SEC01
!insertmacro InstallFile *.txt
; Subfolders
- !insertmacro InstallFolder plugins/*.*
+ !insertmacro InstallFolder plugins
!insertmacro InstallFolder locale
@BUILD_SKINS_TRUE@ !insertmacro InstallFolder skins
@BUILD_LUA_TRUE@ !insertmacro InstallFolder lua
More information about the vlc-commits
mailing list