[packages] apr: update to v1.3.9

[openwrt/svn-archive/archive.git] / sound / streamripper / Makefile

diff --git a/sound/streamripper/Makefile b/sound/streamripper/Makefile
index 79fc063b6a9b63b944c2d4a44088825278ea4fa4..5ed45d458cf34711fc8af0cbd2ca7f91cc2d666c 100644 (file)
--- a/sound/streamripper/Makefile
+++ b/sound/streamripper/Makefile
@@ -1,10 +1,9 @@
 #
-# Copyright (C) 2007 OpenWrt.org
+# Copyright (C) 2007-2009 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #
-# $Id $
 
 include $(TOPDIR)/rules.mk
 
@@ -16,9 +15,6 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=@SF/$(PKG_NAME)
 PKG_MD5SUM:=1a8353af3c36d56f2d8ee8552f632071
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
-
 include $(INCLUDE_DIR)/package.mk
 
 define Package/streamripper
@@ -34,7 +30,8 @@ define Package/streamripper/description
 endef
 
 
-EXTRA_CFLAGS += -I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include
+EXTRA_CFLAGS += $(TARGET_CPPFLAGS)
+
 define Build/Configure
        $(call Build/Configure/Default, \
                --without-ogg \
@@ -54,8 +51,8 @@ endef
 
 define Package/streamripper/install
        $(INSTALL_DIR) $(1)/usr/bin
-       $(CP) $(PKG_INSTALL_DIR)/usr/bin/streamripper $(1)/usr/bin/
-       $(CP) $(PKG_INSTALL_DIR)/usr/bin/agrep $(1)/usr/bin/
+       $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/streamripper $(1)/usr/bin/
+       $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/agrep $(1)/usr/bin/
        $(INSTALL_DIR) $(1)/usr/lib
        $(CP) $(PKG_INSTALL_DIR)/usr/lib/libtre.so* $(1)/usr/lib/
 endef