Commit c6be2331 authored by Rémi Denis-Courmont's avatar 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.
parent 6c81d0fd
...@@ -34,7 +34,7 @@ endif ...@@ -34,7 +34,7 @@ endif
if BUILD_LUA if BUILD_LUA
## Copy lua scripts ## Copy lua scripts
cp -r "$(pkgdatadir)/lua" $@/Contents/MacOS/share/ cp -r "$(pkgdatadir)/lua" $@/Contents/MacOS/share/
cp -r "$(pkglibdir)/lua" $@/Contents/MacOS/ cp -r "$(pkglibexecdir)/lua" $@/Contents/MacOS/
endif endif
## HRTFs ## HRTFs
cp -r $(srcdir)/share/hrtfs $@/Contents/MacOS/share/ cp -r $(srcdir)/share/hrtfs $@/Contents/MacOS/share/
......
...@@ -60,7 +60,7 @@ package-win-common: package-win-install package-win-sdk ...@@ -60,7 +60,7 @@ package-win-common: package-win-install package-win-sdk
if BUILD_LUA if BUILD_LUA
mkdir -p $(win32_destdir)/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/ cp -r $(prefix)/share/vlc/lua/* $(win32_destdir)/lua/
endif endif
......
...@@ -223,7 +223,7 @@ int vlclua_dir_list(const char *luadirname, char ***restrict listp) ...@@ -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), list = vlclua_dir_list_append(list, config_GetUserDir(VLC_USERDATA_DIR),
luadirname); 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); char *datadir = config_GetSysPath(VLC_PKG_DATA_DIR, NULL);
bool both = libdir != NULL && datadir != NULL && strcmp(libdir, datadir); bool both = libdir != NULL && datadir != NULL && strcmp(libdir, datadir);
......
...@@ -57,7 +57,7 @@ EXTRA_DIST += \ ...@@ -57,7 +57,7 @@ EXTRA_DIST += \
$(DIST_solid) $(DIST_solid)
nobase_pkgdata_DATA = nobase_pkgdata_DATA =
nobase_vlclib_DATA = nobase_pkglibexec_SCRIPTS =
nobase_dist_pkgdata_DATA = nobase_dist_pkgdata_DATA =
if BUILD_SKINS if BUILD_SKINS
nobase_pkgdata_DATA += skins2/default.vlt nobase_pkgdata_DATA += skins2/default.vlt
...@@ -118,7 +118,7 @@ luac_verbose_0 = @echo " LUAC $@"; ...@@ -118,7 +118,7 @@ luac_verbose_0 = @echo " LUAC $@";
$(luac_verbose)$(LUAC) -o $@ $< $(luac_verbose)$(LUAC) -o $@ $<
if BUILD_LUA if BUILD_LUA
nobase_vlclib_DATA += \ nobase_pkglibexec_SCRIPTS += \
lua/extensions/VLSub.luac \ lua/extensions/VLSub.luac \
lua/intf/cli.luac \ lua/intf/cli.luac \
lua/intf/dummy.luac \ lua/intf/dummy.luac \
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment