vlc | branch: master | Rémi Denis-Courmont <r...@remlab.net> | Wed Mar  7 
18:45:07 2018 +0200| [c6be2331fa21b025ad1d2d2a22f92615431479c5] | committer: 
Rémi Denis-Courmont

lua: install luac files how Automake intends

Automake only allows DATA target into architecture-independent data
directories. So mark Lua byte-code files as SCRIPTS, which they kinda
are anyway.

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

 extras/package/macosx/package.mak | 2 +-
 extras/package/win32/package.mak  | 2 +-
 modules/lua/vlc.c                 | 2 +-
 share/Makefile.am                 | 4 ++--
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/extras/package/macosx/package.mak 
b/extras/package/macosx/package.mak
index ed0d7dd646..3722a7eb86 100644
--- a/extras/package/macosx/package.mak
+++ b/extras/package/macosx/package.mak
@@ -34,7 +34,7 @@ endif
 if BUILD_LUA
        ## Copy lua scripts
        cp -r "$(pkgdatadir)/lua" $@/Contents/MacOS/share/
-       cp -r "$(pkglibdir)/lua" $@/Contents/MacOS/
+       cp -r "$(pkglibexecdir)/lua" $@/Contents/MacOS/
 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 591a3e743a..6df9debd7f 100644
--- a/extras/package/win32/package.mak
+++ b/extras/package/win32/package.mak
@@ -60,7 +60,7 @@ package-win-common: package-win-install package-win-sdk
 
 if BUILD_LUA
        mkdir -p $(win32_destdir)/lua/
-       cp -r $(prefix)/lib/vlc/lua/* $(win32_destdir)/lua/
+       cp -r $(pkglibexecdir)/lua/* $(win32_destdir)/lua/
        cp -r $(prefix)/share/vlc/lua/* $(win32_destdir)/lua/
 endif
 
diff --git a/modules/lua/vlc.c b/modules/lua/vlc.c
index 846c979223..837923c2cf 100644
--- a/modules/lua/vlc.c
+++ b/modules/lua/vlc.c
@@ -223,7 +223,7 @@ int vlclua_dir_list(const char *luadirname, char 
***restrict listp)
     list = vlclua_dir_list_append(list, config_GetUserDir(VLC_USERDATA_DIR),
                                   luadirname);
 
-    char *libdir = config_GetSysPath(VLC_PKG_LIB_DIR, NULL);
+    char *libdir = config_GetSysPath(VLC_PKG_LIBEXEC_DIR, NULL);
     char *datadir = config_GetSysPath(VLC_PKG_DATA_DIR, NULL);
     bool both = libdir != NULL && datadir != NULL && strcmp(libdir, datadir);
 
diff --git a/share/Makefile.am b/share/Makefile.am
index deb75e6b29..e5b801a5be 100644
--- a/share/Makefile.am
+++ b/share/Makefile.am
@@ -57,7 +57,7 @@ EXTRA_DIST += \
        $(DIST_solid)
 
 nobase_pkgdata_DATA =
-nobase_vlclib_DATA =
+nobase_pkglibexec_SCRIPTS =
 nobase_dist_pkgdata_DATA =
 if BUILD_SKINS
 nobase_pkgdata_DATA += skins2/default.vlt
@@ -118,7 +118,7 @@ luac_verbose_0 = @echo "  LUAC   $@";
        $(luac_verbose)$(LUAC) -o $@ $<
 
 if BUILD_LUA
-nobase_vlclib_DATA += \
+nobase_pkglibexec_SCRIPTS += \
        lua/extensions/VLSub.luac \
        lua/intf/cli.luac \
        lua/intf/dummy.luac \

_______________________________________________
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits

Reply via email to