vlc | branch: master | Rémi Denis-Courmont <[email protected]> | Mon Mar 5
23:30:03 2018 +0200| [ba05ad61645b38ad206e23949a6352871ab59773] | committer:
Rémi Denis-Courmont
vlc-cache-gen: use correct install directory
pkglibexecdir is the pseudo-directory for internal executables.
vlc-qt-check already uses that. Indeed, PROGRAMS and SCRIPTS targets
are not allowed by automake in pkglibdir.
(libexecdir can be set to '${libdir}' in configure if/when the
distinction is unwanted.)
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=ba05ad61645b38ad206e23949a6352871ab59773
---
Makefile.am | 2 +-
bin/Makefile.am | 2 +-
extras/package/macosx/package.mak | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/Makefile.am b/Makefile.am
index 3ac82623ad..d53610e79c 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -165,7 +165,7 @@ install-exec-hook:
if test "$(build)" = "$(host)"; then \
PATH="$(DESTDIR)$(bindir):$$PATH" \
LD_LIBRARY_PATH="$(DESTDIR)$(libdir):$$LD_LIBRARY_PATH" \
- "$(DESTDIR)$(vlclibdir)/vlc-cache-gen$(EXEEXT)" \
+ "$(DESTDIR)$(pkglibexecdir)/vlc-cache-gen$(EXEEXT)" \
"$(DESTDIR)$(vlclibdir)/plugins" ; \
else \
echo "Cross-compilation: cache generation skipped!" ; \
diff --git a/bin/Makefile.am b/bin/Makefile.am
index 2877e8b0ea..eb3cf6ec35 100644
--- a/bin/Makefile.am
+++ b/bin/Makefile.am
@@ -109,7 +109,7 @@ vlc_win32_rc.$(OBJEXT): vlc_win32_rc.rc
$(top_srcdir)/extras/package/win32/vlc.e
# Plug-ins cache generator
#
if HAVE_DYNAMIC_PLUGINS
-vlclib_PROGRAMS = vlc-cache-gen
+pkglibexec_PROGRAMS = vlc-cache-gen
endif
vlc_cache_gen_SOURCES = cachegen.c
vlc_cache_gen_LDADD = \
diff --git a/extras/package/macosx/package.mak
b/extras/package/macosx/package.mak
index 2b9b569abc..ed0d7dd646 100644
--- a/extras/package/macosx/package.mak
+++ b/extras/package/macosx/package.mak
@@ -95,7 +95,7 @@ package-macosx-release:
cp -Rp $(top_builddir)/VLC.app $(top_builddir)/vlc-$(VERSION)-release/
cp $(srcdir)/extras/package/macosx/dmg/*
$(top_builddir)/vlc-$(VERSION)-release/
cp "$(srcdir)/extras/package/macosx/codesign.sh"
$(top_builddir)/vlc-$(VERSION)-release/
- cp "$(prefix)/lib/vlc/vlc-cache-gen"
$(top_builddir)/vlc-$(VERSION)-release/
+ cp "$(pkglibexecdir)/vlc-cache-gen"
$(top_builddir)/vlc-$(VERSION)-release/
install_name_tool -add_rpath
"@executable_path/VLC.app/Contents/MacOS/lib"
$(top_builddir)/vlc-$(VERSION)-release/vlc-cache-gen
zip -r -y -9 $(top_builddir)/vlc-$(VERSION)-release.zip
$(top_builddir)/vlc-$(VERSION)-release
rm -rf "$(top_builddir)/vlc-$(VERSION)-release"
_______________________________________________
vlc-commits mailing list
[email protected]
https://mailman.videolan.org/listinfo/vlc-commits
