aboutsummaryrefslogtreecommitdiff
path: root/package/vlc/vlc.mk
diff options
context:
space:
mode:
authorGravatar Baruch Siach <baruch@tkos.co.il>2014-11-17 10:18:14 +0200
committerGravatar Thomas Petazzoni <thomas.petazzoni@free-electrons.com>2014-11-18 23:08:04 +0100
commit44d15563c706dce48f84b55bd299fc94c655f071 (patch)
treef7d1044277227f9082ca228da6d6914ce9ce433b /package/vlc/vlc.mk
parentec52d2b7999b844f2e877dfcf43c43e25d63f895 (diff)
downloadbuildroot-44d15563c706dce48f84b55bd299fc94c655f071.tar.gz
buildroot-44d15563c706dce48f84b55bd299fc94c655f071.tar.bz2
live555: use upstream install target for staging installation
Move include directories out of $(STAGING_DIR)/usr/include/live. This is upstream choice, and is consistent with e.g. Debian. Update mplayer and vlc to match. Signed-off-by: Baruch Siach <baruch@tkos.co.il> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Diffstat (limited to 'package/vlc/vlc.mk')
-rw-r--r--package/vlc/vlc.mk9
1 files changed, 4 insertions, 5 deletions
diff --git a/package/vlc/vlc.mk b/package/vlc/vlc.mk
index 7e81d590e5..e2c81d6e89 100644
--- a/package/vlc/vlc.mk
+++ b/package/vlc/vlc.mk
@@ -231,11 +231,10 @@ VLC_CONF_OPTS += --enable-live555
VLC_DEPENDENCIES += live555
VLC_CONF_ENV += \
LIVE555_CFLAGS="\
- -I$(STAGING_DIR)/usr/include/live \
- -I$(STAGING_DIR)/usr/include/live/BasicUsageEnvironment \
- -I$(STAGING_DIR)/usr/include/live/groupsock \
- -I$(STAGING_DIR)/usr/include/live/liveMedia \
- -I$(STAGING_DIR)/usr/include/live/UsageEnvironment \
+ -I$(STAGING_DIR)/usr/include/BasicUsageEnvironment \
+ -I$(STAGING_DIR)/usr/include/groupsock \
+ -I$(STAGING_DIR)/usr/include/liveMedia \
+ -I$(STAGING_DIR)/usr/include/UsageEnvironment \
" \
LIVE555_LIBS="-L$(STAGING_DIR)/usr/lib -lliveMedia"
else