vlc | branch: master | Rémi Denis-Courmont <r...@remlab.net> | Mon Mar 5 23:40:16 2018 +0200| [9ce86be4e8699693c2e5b6d6e4820ff8b4c1033c] | committer: Rémi Denis-Courmont
Makefile: use pkglibdir for libraries (see previous commit for rationale) > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=9ce86be4e8699693c2e5b6d6e4820ff8b4c1033c --- Makefile.am | 4 ++-- modules/common.am | 2 +- src/Makefile.am | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Makefile.am b/Makefile.am index d53610e79c..87516e3a6a 100644 --- a/Makefile.am +++ b/Makefile.am @@ -166,14 +166,14 @@ install-exec-hook: PATH="$(DESTDIR)$(bindir):$$PATH" \ LD_LIBRARY_PATH="$(DESTDIR)$(libdir):$$LD_LIBRARY_PATH" \ "$(DESTDIR)$(pkglibexecdir)/vlc-cache-gen$(EXEEXT)" \ - "$(DESTDIR)$(vlclibdir)/plugins" ; \ + "$(DESTDIR)$(pkglibdir)/plugins" ; \ else \ echo "Cross-compilation: cache generation skipped!" ; \ fi endif uninstall-hook: - rm -f -- "$(DESTDIR)$(vlclibdir)/plugins/plugins.dat" + rm -f -- "$(DESTDIR)$(pkglibdir)/plugins/plugins.dat" ############################################################################### # Test coverage diff --git a/modules/common.am b/modules/common.am index 1b9117c98d..37267f0341 100644 --- a/modules/common.am +++ b/modules/common.am @@ -8,7 +8,7 @@ AUTOMAKE_OPTIONS = subdir-objects NULL = -pluginsdir = $(vlclibdir)/plugins +pluginsdir = $(pkglibdir)/plugins BUILT_SOURCES = CLEANFILES = $(BUILT_SOURCES) diff --git a/src/Makefile.am b/src/Makefile.am index f4617120d0..90011eedbc 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -171,7 +171,7 @@ AM_CPPFLAGS = $(INCICONV) $(IDN_CFLAGS) \ -DMODULE_STRING=\"core\" \ -DLOCALEDIR=\"$(localedir)\" \ -DPKGDATADIR=\"$(pkgdatadir)\" \ - -DPKGLIBDIR=\"$(vlclibdir)\" + -DPKGLIBDIR=\"$(pkglibdir)\" AM_CFLAGS = $(CFLAGS_libvlccore) if HAVE_DYNAMIC_PLUGINS AM_CPPFLAGS += -DHAVE_DYNAMIC_PLUGINS _______________________________________________ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits
