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>
This commit is contained in:
Baruch Siach
2014-11-17 10:18:14 +02:00
committed by Thomas Petazzoni
parent ec52d2b799
commit 44d15563c7
3 changed files with 7 additions and 25 deletions

View File

@@ -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