share: Install precompiled lua scripts in /share instead of /lib
authorHugo Beauzée-Luyssen <hugo@beauzee.fr>
Thu, 3 Aug 2017 14:31:09 +0000 (16:31 +0200)
committerHugo Beauzée-Luyssen <hugo@beauzee.fr>
Fri, 4 Aug 2017 13:11:12 +0000 (15:11 +0200)
Fix #18639

extras/package/macosx/package.mak
extras/package/win32/package.mak
share/Makefile.am

index 87afbcc..efdc0dc 100644 (file)
@@ -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/
index 4965ee8..b42c533 100644 (file)
@@ -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
index 9ca7210..2da2301 100644 (file)
@@ -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 \