backport fixes from changeset:2408 to trunk

[openwrt.git] / openwrt / package / mpd / Makefile

diff --git a/openwrt/package/mpd/Makefile b/openwrt/package/mpd/Makefile
index f8c4f14..7177537 100644 (file)
--- a/openwrt/package/mpd/Makefile
+++ b/openwrt/package/mpd/Makefile
@@ -23,7 +23,7 @@ PKG_CONFIGURE_OPTIONS := \
        --disable-mpc \
        --disable-aac \
 
        --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 \
 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
 
 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 \
 PKG_DEPENDS += libvorbisidec
 PKG_CONFIGURE_OPTIONS += \
        --with-tremor \


@@ -44,7 +44,7 @@ else
 PKG_CONFIGURE_OPTIONS += --disable-ogg
 endif
 
 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 \
 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)))
 
 
 $(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))" \
        (cd $(PKG_BUILD_DIR); \
                $(TARGET_CONFIGURE_OPTS) \
                CFLAGS="$(strip $(TARGET_CFLAGS))" \