fix libipq install if staging dir doesn't contain usr/lib and usr/include yet

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

diff --git a/openwrt/package/speex/Makefile b/openwrt/package/speex/Makefile
index d9c1c16..8c7fc26 100644 (file)
--- a/openwrt/package/speex/Makefile
+++ b/openwrt/package/speex/Makefile
@@ -3,11 +3,11 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME := speex
 include $(TOPDIR)/rules.mk
 
 PKG_NAME := speex

-PKG_VERSION := 1.0.4
+PKG_VERSION := 1.1.7

 PKG_RELEASE := 1
 PKG_RELEASE := 1

-PKG_MD5SUM := 15a0686b7e1f81d352a648044b350fcc
+PKG_MD5SUM := a900d009f937efbb896f1f816193742f

 
 

-PKG_SOURCE_SITE := http://www.speex.org/download
+PKG_SOURCE_SITE := http://us.speex.org/download 

 PKG_SOURCE_FILE := $(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_CAT := zcat
 PKG_SOURCE_DIR := $(PKG_NAME)-$(PKG_VERSION)
 PKG_SOURCE_FILE := $(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_CAT := zcat
 PKG_SOURCE_DIR := $(PKG_NAME)-$(PKG_VERSION)


@@ -38,23 +38,26 @@ $(PKG_BUILD_DIR)/.configured: $(PKG_BUILD_DIR)/.unpacked
                --sysconfdir=/etc \
                --localstatedir=/var \
                --enable-shared \
                --sysconfdir=/etc \
                --localstatedir=/var \
                --enable-shared \

+               --disable-oggtest \

        );
        touch $(PKG_BUILD_DIR)/.configured
 
        );
        touch $(PKG_BUILD_DIR)/.configured
 

-$(PKG_BUILD_DIR)/src/libspeex.la: $(PKG_BUILD_DIR)/.configured
-       $(MAKE) -C $(PKG_BUILD_DIR)
+$(PKG_BUILD_DIR)/libspeex/libspeex.la: $(PKG_BUILD_DIR)/.configured
+       $(MAKE) -C $(PKG_BUILD_DIR) \
+         bin_PROGRAMS=""

 
 

-$(STAGING_DIR)/lib/libspeex.a: $(PKG_BUILD_DIR)/src/libspeex.la
+$(STAGING_DIR)/lib/libspeex.a: $(PKG_BUILD_DIR)/libspeex/libspeex.la

        $(MAKE) -C $(PKG_BUILD_DIR) \
          CC=$(TARGET_CC) \
          DESTDIR="$(STAGING_DIR)" \
        $(MAKE) -C $(PKG_BUILD_DIR) \
          CC=$(TARGET_CC) \
          DESTDIR="$(STAGING_DIR)" \

+         bin_PROGRAMS="" \

          install
 
 $(PKG_IPK): $(STAGING_DIR)/lib/libspeex.a
        mkdir -p $(PACKAGE_DIR)
        $(SCRIPT_DIR)/make-ipkg-dir.sh $(PKG_BUILD_DIR)/ipkg/speex speex.control $(PKG_VERSION)-$(PKG_RELEASE) $(ARCH)
        mkdir -p $(PKG_BUILD_DIR)/ipkg/speex/usr/lib
          install
 
 $(PKG_IPK): $(STAGING_DIR)/lib/libspeex.a
        mkdir -p $(PACKAGE_DIR)
        $(SCRIPT_DIR)/make-ipkg-dir.sh $(PKG_BUILD_DIR)/ipkg/speex speex.control $(PKG_VERSION)-$(PKG_RELEASE) $(ARCH)
        mkdir -p $(PKG_BUILD_DIR)/ipkg/speex/usr/lib

-       cp -a $(STAGING_DIR)/lib/libspeex.so* $(PKG_BUILD_DIR)/ipkg/speex/usr/lib
+       cp -a $(STAGING_DIR)/lib/libspeex.so.* $(PKG_BUILD_DIR)/ipkg/speex/usr/lib

        $(STRIP) $(PKG_BUILD_DIR)/ipkg/speex/usr/lib/*
        $(IPKG_BUILD) $(PKG_BUILD_DIR)/ipkg/speex $(PACKAGE_DIR)
 
        $(STRIP) $(PKG_BUILD_DIR)/ipkg/speex/usr/lib/*
        $(IPKG_BUILD) $(PKG_BUILD_DIR)/ipkg/speex $(PACKAGE_DIR)