X-Git-Url: http://git.rohieb.name/openwrt.git/blobdiff_plain/74152b6a58d0236e31df0dba7693774c6d0cbeb2..8079817d177d5de7e084ff3357b94df8452a76e5:/openwrt/package/mpd/Makefile

diff --git a/openwrt/package/mpd/Makefile b/openwrt/package/mpd/Makefile
index f8c4f14b1..1e97df496 100644
--- a/openwrt/package/mpd/Makefile
+++ b/openwrt/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))" \
@@ -102,8 +102,8 @@ $(PKG_BUILD_DIR)/.built:
 $(IPKG_MPD):
 	install -d -m0755 $(IDIR_MPD)/usr/bin
 	install -d -m0755 $(IDIR_MPD)/etc
-	cp -fp $(PKG_INSTALL_DIR)/usr/bin/mpd $(IDIR_MPD)/usr/bin
-	cp -fp $(PKG_BUILD_DIR)/doc/mpdconf.example $(IDIR_MPD)/etc/mpd.conf
+	$(CP) $(PKG_INSTALL_DIR)/usr/bin/mpd $(IDIR_MPD)/usr/bin
+	$(CP) $(PKG_BUILD_DIR)/doc/mpdconf.example $(IDIR_MPD)/etc/mpd.conf
 	echo "Depends: $(PKG_DEPENDS)" >> $(IDIR_MPD)/CONTROL/control
 	$(RSTRIP) $(IDIR_MPD)
 	$(IPKG_BUILD) $(IDIR_MPD) $(PACKAGE_DIR)