add common functions for the new config file format

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

diff --git a/openwrt/package/mpd/Makefile b/openwrt/package/mpd/Makefile
index 288b62a..1e97df4 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 \


@@ -102,8 +102,8 @@ $(PKG_BUILD_DIR)/.built:
 $(IPKG_MPD):
        install -d -m0755 $(IDIR_MPD)/usr/bin
        install -d -m0755 $(IDIR_MPD)/etc
 $(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)
        echo "Depends: $(PKG_DEPENDS)" >> $(IDIR_MPD)/CONTROL/control
        $(RSTRIP) $(IDIR_MPD)
        $(IPKG_BUILD) $(IDIR_MPD) $(PACKAGE_DIR)