Makefile: use pkglibdir for libraries
authorRémi Denis-Courmont <remi@remlab.net>
Mon, 5 Mar 2018 21:40:16 +0000 (23:40 +0200)
committerRémi Denis-Courmont <remi@remlab.net>
Tue, 6 Mar 2018 18:55:50 +0000 (20:55 +0200)
(see previous commit for rationale)

Makefile.am
modules/common.am
src/Makefile.am

index d53610e..87516e3 100644 (file)
@@ -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
index 1b9117c..37267f0 100644 (file)
@@ -8,7 +8,7 @@
 AUTOMAKE_OPTIONS = subdir-objects
 
 NULL =
-pluginsdir = $(vlclibdir)/plugins
+pluginsdir = $(pkglibdir)/plugins
 BUILT_SOURCES =
 CLEANFILES = $(BUILT_SOURCES)
 
index f461712..90011ee 100644 (file)
@@ -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