Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
VLC
Manage
Activity
Members
Labels
Plan
Issues
4k
Issue boards
Milestones
Code
Merge requests
458
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Analyze
Contributor analytics
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
VideoLAN
VLC
Commits
9ce86be4
Commit
9ce86be4
authored
7 years ago
by
Rémi Denis-Courmont
Browse files
Options
Downloads
Patches
Plain Diff
Makefile: use pkglibdir for libraries
(see previous commit for rationale)
parent
e1bac00d
No related branches found
Branches containing commit
No related tags found
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
Makefile.am
+2
-2
2 additions, 2 deletions
Makefile.am
modules/common.am
+1
-1
1 addition, 1 deletion
modules/common.am
src/Makefile.am
+1
-1
1 addition, 1 deletion
src/Makefile.am
with
4 additions
and
4 deletions
Makefile.am
+
2
−
2
View file @
9ce86be4
...
...
@@ -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
)$(
vlc
libdir
)
/plugins"
;
\
"
$(
DESTDIR
)$(
pkg
libdir
)
/plugins"
;
\
else
\
echo
"Cross-compilation: cache generation skipped!"
;
\
fi
endif
uninstall-hook
:
rm
-f
--
"
$(
DESTDIR
)$(
vlc
libdir
)
/plugins/plugins.dat"
rm
-f
--
"
$(
DESTDIR
)$(
pkg
libdir
)
/plugins/plugins.dat"
###############################################################################
# Test coverage
...
...
This diff is collapsed.
Click to expand it.
modules/common.am
+
1
−
1
View file @
9ce86be4
...
...
@@ -8,7 +8,7 @@
AUTOMAKE_OPTIONS = subdir-objects
NULL =
pluginsdir = $(
vlc
libdir)/plugins
pluginsdir = $(
pkg
libdir)/plugins
BUILT_SOURCES =
CLEANFILES = $(BUILT_SOURCES)
...
...
This diff is collapsed.
Click to expand it.
src/Makefile.am
+
1
−
1
View file @
9ce86be4
...
...
@@ -171,7 +171,7 @@ AM_CPPFLAGS = $(INCICONV) $(IDN_CFLAGS) \
-DMODULE_STRING
=
\"
core
\"
\
-DLOCALEDIR
=
\"
$(
localedir
)
\"
\
-DPKGDATADIR
=
\"
$(
pkgdatadir
)
\"
\
-DPKGLIBDIR
=
\"
$(
vlc
libdir
)
\"
-DPKGLIBDIR
=
\"
$(
pkg
libdir
)
\"
AM_CFLAGS
=
$(
CFLAGS_libvlccore
)
if
HAVE_DYNAMIC_PLUGINS
AM_CPPFLAGS
+=
-DHAVE_DYNAMIC_PLUGINS
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment