[vlc-commits] share: Install precompiled lua scripts in /share instead of /lib

[Hugo Beauzée-Luyssen]

vlc | branch: master | Hugo Beauzée-Luyssen <hugo at beauzee.fr> | Thu Aug  3 16:31:09 2017 +0200| [061b7bbcd3686a2602c7e2b047e065013056dd6e] | committer: Hugo Beauzée-Luyssen

share: Install precompiled lua scripts in /share instead of /lib

Fix #18639

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

 extras/package/macosx/package.mak | 2 +-
 extras/package/win32/package.mak  | 2 +-
 share/Makefile.am                 | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/extras/package/macosx/package.mak b/extras/package/macosx/package.mak
index 87afbcc173..efdc0dc227 100644
--- a/extras/package/macosx/package.mak
+++ b/extras/package/macosx/package.mak
@@ -33,7 +33,7 @@ endif
 	mkdir -p $@/Contents/MacOS/share/locale/
 if BUILD_LUA
 	## Copy lua scripts
-	cp -r "$(prefix)/lib/vlc/lua" "$(prefix)/share/vlc/lua" $@/Contents/MacOS/share/
+	cp -r "$(prefix)/share/vlc/lua" $@/Contents/MacOS/share/
 endif
 	## HRTFs
 	cp -r $(srcdir)/share/hrtfs $@/Contents/MacOS/share/
diff --git a/extras/package/win32/package.mak b/extras/package/win32/package.mak
index 4965ee84ab..b42c53341d 100644
--- a/extras/package/win32/package.mak
+++ b/extras/package/win32/package.mak
@@ -50,7 +50,7 @@ package-win-common: package-win-install
 
 if BUILD_LUA
 	mkdir -p $(win32_destdir)/lua/
-	cp -r $(prefix)/lib/vlc/lua/* $(prefix)/share/vlc/lua/* $(win32_destdir)/lua/
+	cp -r $(prefix)/share/vlc/lua/* $(win32_destdir)/lua/
 endif
 
 if BUILD_SKINS
diff --git a/share/Makefile.am b/share/Makefile.am
index 9ca7210322..2da2301bf9 100644
--- a/share/Makefile.am
+++ b/share/Makefile.am
@@ -116,7 +116,7 @@ luac_verbose_0 = @echo "  LUAC   $@";
 	$(luac_verbose)$(LUAC) -o $@ $<
 
 if BUILD_LUA
-nobase_vlclib_DATA = \
+nobase_vlcdata_DATA += \
 	lua/extensions/VLSub.luac \
 	lua/intf/cli.luac \
 	lua/intf/dummy.luac \