Skip to content

Commit f21c501

Browse files
committed
Made installation directory portable across Linux distros
1 parent 5aef093 commit f21c501

File tree

2 files changed

+2
-26
lines changed

2 files changed

+2
-26
lines changed

vlc-2.1.x/Makefile

+1-13
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
PREFIX = /usr
21
LD = ld
32
CC = cc
43
INSTALL = install
@@ -7,18 +6,7 @@ LDFLAGS =
76
VLC_PLUGIN_CFLAGS := $(shell pkg-config --cflags vlc-plugin)
87
VLC_PLUGIN_LIBS := $(shell pkg-config --libs vlc-plugin)
98

10-
libdir = $(PREFIX)/lib
11-
12-
# Slackware and openSUSE use /usr/lib64 on x86_64
13-
ARCH=$(shell uname -m)
14-
ifeq ($(ARCH), x86_64)
15-
lib64Test=$(shell grep -E "Slackware|openSUSE" /etc/*-release | wc -l)
16-
ifneq ($(lib64Test), 0)
17-
libdir = $(PREFIX)/lib64
18-
endif
19-
endif
20-
21-
plugindir = $(libdir)/vlc/plugins
9+
plugindir := $(shell pkg-config vlc-plugin --variable=pluginsdir)
2210

2311
override CC += -std=gnu99
2412
override CPPFLAGS += -DPIC -I. -Isrc

vlc-2.2.x+/Makefile

+1-13
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
PREFIX = /usr
21
LD = ld
32
CC = cc
43
INSTALL = install
@@ -7,18 +6,7 @@ LDFLAGS =
76
VLC_PLUGIN_CFLAGS := $(shell pkg-config --cflags vlc-plugin)
87
VLC_PLUGIN_LIBS := $(shell pkg-config --libs vlc-plugin)
98

10-
libdir = $(PREFIX)/lib
11-
12-
# Slackware and openSUSE use /usr/lib64 on x86_64
13-
ARCH=$(shell uname -m)
14-
ifeq ($(ARCH), x86_64)
15-
lib64Test=$(shell grep -E "Slackware|openSUSE" /etc/*-release | wc -l)
16-
ifneq ($(lib64Test), 0)
17-
libdir = $(PREFIX)/lib64
18-
endif
19-
endif
20-
21-
plugindir = $(libdir)/vlc/plugins
9+
plugindir := $(shell pkg-config vlc-plugin --variable=pluginsdir)
2210

2311
override CC += -std=gnu99
2412
override CPPFLAGS += -DPIC -I. -Isrc

0 commit comments

Comments
 (0)