cleanups and fixes for libsamplerate and libsndfile

[packages.git] / libs / libsamplerate / Makefile

diff --git a/libs/libsamplerate/Makefile b/libs/libsamplerate/Makefile
index 4648e56..d2993fc 100644 (file)
--- a/libs/libsamplerate/Makefile
+++ b/libs/libsamplerate/Makefile
@@ -15,7 +15,6 @@ PKG_RELEASE:=1
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://www.mega-nerd.com/SRC/
 PKG_MD5SUM:=6861c2c6b8e5273c9b80cf736b9fd0e
-PKG_CAT:=zcat
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
@@ -27,29 +26,28 @@ define Package/libsamplerate
   CATEGORY:=Libraries
   DEPENDS:=+libsndfile
   TITLE:=Sample Rate Converter
-  DESCRIPTION:=\
-       Secret Rabbit Code (aka libsamplerate) is a Sample Rate Converter for audio
   URL:=http://www.mega-nerd.com/SRC/index.html
 endef
 
+define Package/libsamplerate/description
+       Secret Rabbit Code (aka libsamplerate) is a Sample Rate Converter for audio
+endef
+
 define Build/Configure
        $(call Build/Configure/Default, \
                --disable-fftw \
        )
+       $(call libtool_disable_rpath)
 endef
 
 define Build/Compile
-       $(call Build/Compile/Default,\
-               DESTDIR="$(PKG_INSTALL_DIR)" \
-               all install \
-       )
+       $(MAKE) -C $(PKG_BUILD_DIR) all
+       $(call libtool_fixup_libdir,$(PKG_INSTALL_DIR))
+       $(MAKE) -C $(PKG_BUILD_DIR) DESTDIR="$(PKG_INSTALL_DIR)" install
 endef
 
 define Build/InstallDev
-       mkdir -p $(STAGING_DIR)/usr/include
-       $(CP) $(PKG_INSTALL_DIR)/usr/include/* $(STAGING_DIR)/usr/include/
-       mkdir -p $(STAGING_DIR)/usr/lib/
-       $(CP) $(PKG_INSTALL_DIR)/usr/lib/libsamplerate.* $(STAGING_DIR)/usr/lib/
+       $(CP) $(PKG_INSTALL_DIR)/* $(1)/
 endef
 
 define Build/UninstallDev