X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/0f3b636c877ddc7322092d0213ca7c831611b58f..bf0d0855df44c49b8a90fbd43dab87eace5ac1a0:/package/mpd/Makefile?ds=inline diff --git a/package/mpd/Makefile b/package/mpd/Makefile index f8c4f14b1..71775379f 100644 --- a/package/mpd/Makefile +++ b/package/mpd/Makefile @@ -23,7 +23,7 @@ PKG_CONFIGURE_OPTIONS := \ --disable-mpc \ --disable-aac \ -ifneq ($(BR2_PACKAGE_MPD_MP3),) +ifneq ($(BR2_COMPILE_MPD_WITH_MP3),) PKG_DEPENDS += libid3tag libmad PKG_CONFIGURE_OPTIONS += \ --with-id3tag-includes=$(STAGING_DIR)/usr/include \ @@ -34,7 +34,7 @@ else PKG_CONFIGURE_OPTIONS += --disable-id3 --disable-mp3 endif -ifneq ($(BR2_PACKAGE_MPD_OGG),) +ifneq ($(BR2_COMPILE_MPD_WITH_OGG),) PKG_DEPENDS += libvorbisidec PKG_CONFIGURE_OPTIONS += \ --with-tremor \ @@ -44,7 +44,7 @@ else PKG_CONFIGURE_OPTIONS += --disable-ogg endif -ifneq ($(BR2_PACKAGE_MPD_FLAC),) +ifneq ($(BR2_COMPILE_MPD_WITH_FLAC),) PKG_DEPENDS += libflac PKG_CONFIGURE_OPTIONS += \ --with-libFLAC-includes=$(STAGING_DIR)/usr/include \ @@ -62,7 +62,7 @@ include $(TOPDIR)/package/rules.mk $(eval $(call PKG_template,MPD,mpd,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH))) -$(PKG_BUILD_DIR)/.configured: $(PKG_BUILD_DIR)/.prepared +$(PKG_BUILD_DIR)/.configured: (cd $(PKG_BUILD_DIR); \ $(TARGET_CONFIGURE_OPTS) \ CFLAGS="$(strip $(TARGET_CFLAGS))" \