vlc-cache-gen: use correct install directory
authorRémi Denis-Courmont <remi@remlab.net>
Mon, 5 Mar 2018 21:30:03 +0000 (23:30 +0200)
committerRémi Denis-Courmont <remi@remlab.net>
Tue, 6 Mar 2018 18:55:50 +0000 (20:55 +0200)
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.)

Makefile.am
bin/Makefile.am
extras/package/macosx/package.mak

index 3ac8262..d53610e 100644 (file)
@@ -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!" ; \
index 2877e8b..eb3cf6e 100644 (file)
@@ -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 = \
index 2b9b569..ed0d7dd 100644 (file)
@@ -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"