fix gmediaserver compile

[openwrt/svn-archive/archive.git] / libs / flac / Makefile

diff --git a/libs/flac/Makefile b/libs/flac/Makefile
index 806e9030fd25f4131505fe5bd633bc359e81b67a..2e73f849c7a769f56a2f29f11b2447e1e98a58e8 100644 (file)
--- a/libs/flac/Makefile
+++ b/libs/flac/Makefile
@@ -12,13 +12,12 @@ PKG_NAME:=flac
 PKG_VERSION:=1.1.2
 PKG_RELEASE:=1
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=@SF/flac
 PKG_MD5SUM:=2bfc127cdda02834d0491ab531a20960
 PKG_CAT:=zcat
 
-PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 
 include $(INCLUDE_DIR)/package.mk
 
@@ -26,7 +25,6 @@ define Package/libflac
   SECTION:=libs
   CATEGORY:=Libraries
   TITLE:=Free Lossless Audio Codec library
-  DESCRIPTION:=Free Lossless Audio Codec (FLAC) library.
   URL:=ttp://flac.sourceforge.net/
 endef
 
@@ -34,19 +32,12 @@ define Build/Configure
 endef
 
 define Build/Compile
-       rm -rf $(PKG_INSTALL_DIR)
-       mkdir -p $(PKG_INSTALL_DIR)
        $(MAKE) -C $(PKG_BUILD_DIR) -f Makefile.lite \
                $(TARGET_CONFIGURE_OPTS) \
                RELEASE_CFLAGS="$(TARGET_CFLAGS)" \
                libFLAC
 endef
 
-define Package/libflac/install
-       $(INSTALL_DIR) $(1)/usr/lib
-       $(CP) $(PKG_BUILD_DIR)/obj/release/lib/libFLAC.so $(1)/usr/lib/
-endef
-
 define Build/InstallDev
        mkdir -p $(STAGING_DIR)/usr/include
        $(CP) $(PKG_BUILD_DIR)/include/FLAC $(STAGING_DIR)/usr/include/
@@ -60,4 +51,9 @@ define Build/UninstallDev
                $(STAGING_DIR)/usr/lib/libFLAC.{a,so}
 endef
 
+define Package/libflac/install
+       $(INSTALL_DIR) $(1)/usr/lib
+       $(CP) $(PKG_BUILD_DIR)/obj/release/lib/libFLAC.so $(1)/usr/lib/
+endef
+
 $(eval $(call BuildPackage,libflac))