diff options
| author | Peter Korsgaard <jacmet@sunsite.dk> | 2010-09-27 18:08:51 +0200 |
|---|---|---|
| committer | Peter Korsgaard <jacmet@sunsite.dk> | 2010-09-27 18:08:51 +0200 |
| commit | e611747255055ad6f9409dffe7eefd233ac86964 (patch) | |
| tree | bb7f18de995dcfd0b4a947b5c7e912ea6a5fc486 /package/multimedia | |
| parent | ed6bdad8a6181d9d128252f1c7a6cb2cce81ab03 (diff) | |
| parent | 478ea1a12dffca0025c0ad55ad702cbaec465f93 (diff) | |
Merge branch 'for-2010.11/no-install-strip' of git://git.busybox.net/~tpetazzoni/git/buildroot
Diffstat (limited to 'package/multimedia')
| -rw-r--r-- | package/multimedia/alsa-lib/alsa-lib.mk | 2 | ||||
| -rw-r--r-- | package/multimedia/ffmpeg/ffmpeg.mk | 3 |
2 files changed, 0 insertions, 5 deletions
diff --git a/package/multimedia/alsa-lib/alsa-lib.mk b/package/multimedia/alsa-lib/alsa-lib.mk index c1a2b1a5d..5447b6c1c 100644 --- a/package/multimedia/alsa-lib/alsa-lib.mk +++ b/package/multimedia/alsa-lib/alsa-lib.mk @@ -44,8 +44,6 @@ ALSA_LIB_CONF_OPT += --disable-old-symbols endif ifeq ($(BR2_ENABLE_DEBUG),y) -# install-exec doesn't install the config files -ALSA_LIB_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) install ALSA_LIB_CONF_OPT += --enable-debug endif diff --git a/package/multimedia/ffmpeg/ffmpeg.mk b/package/multimedia/ffmpeg/ffmpeg.mk index aac39c15b..4e6924c3d 100644 --- a/package/multimedia/ffmpeg/ffmpeg.mk +++ b/package/multimedia/ffmpeg/ffmpeg.mk @@ -134,7 +134,4 @@ define FFMPEG_CONFIGURE_CMDS ) endef -# Override FFMPEG_INSTALL_TARGET_OPT: FFmpeg does not support install-strip -FFMPEG_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) install - $(eval $(call AUTOTARGETS,package/multimedia,ffmpeg)) |