mirror of https://code.videolan.org/videolan/vlc
Makefile: use pkglibdir for libraries
(see previous commit for rationale)
This commit is contained in:
parent
e1bac00ddb
commit
9ce86be4e8
|
@ -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
|
||||
|
|
|
@ -8,7 +8,7 @@
|
|||
AUTOMAKE_OPTIONS = subdir-objects
|
||||
|
||||
NULL =
|
||||
pluginsdir = $(vlclibdir)/plugins
|
||||
pluginsdir = $(pkglibdir)/plugins
|
||||
BUILT_SOURCES =
|
||||
CLEANFILES = $(BUILT_SOURCES)
|
||||
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Reference in New Issue