remove ref to host directories in config scripts.

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

diff --git a/openwrt/package/speex/Makefile b/openwrt/package/speex/Makefile
index 5bacda3..903966b 100644 (file)
--- a/openwrt/package/speex/Makefile
+++ b/openwrt/package/speex/Makefile
@@ -18,7 +18,7 @@ include $(TOPDIR)/package/rules.mk
 
 $(eval $(call PKG_template,LIBSPEEX,libspeex,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
 
 
 $(eval $(call PKG_template,LIBSPEEX,libspeex,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
 

-$(PKG_BUILD_DIR)/.configured: $(PKG_BUILD_DIR)/.prepared
+$(PKG_BUILD_DIR)/.configured:

        (cd $(PKG_BUILD_DIR); rm -rf config.{cache,status} ; \
                $(TARGET_CONFIGURE_OPTS) \
                CFLAGS="$(strip $(TARGET_CFLAGS))" \
        (cd $(PKG_BUILD_DIR); rm -rf config.{cache,status} ; \
                $(TARGET_CONFIGURE_OPTS) \
                CFLAGS="$(strip $(TARGET_CFLAGS))" \


@@ -61,17 +61,19 @@ $(PKG_BUILD_DIR)/.built:
 
 $(IPKG_LIBSPEEX):
        install -d -m0755 $(IDIR_LIBSPEEX)/usr/lib
 
 $(IPKG_LIBSPEEX):
        install -d -m0755 $(IDIR_LIBSPEEX)/usr/lib

-       cp -fp $(PKG_INSTALL_DIR)/usr/lib/libspeex.so.* $(IDIR_LIBSPEEX)/usr/lib/
+       $(CP) $(PKG_INSTALL_DIR)/usr/lib/libspeex.so.* $(IDIR_LIBSPEEX)/usr/lib/

        $(RSTRIP) $(IDIR_LIBSPEEX)
        $(IPKG_BUILD) $(IDIR_LIBSPEEX) $(PACKAGE_DIR)
 
 $(STAGING_DIR)/usr/lib/libspeex.so: $(PKG_BUILD_DIR)/.built
        mkdir -p $(STAGING_DIR)/usr/include
        $(RSTRIP) $(IDIR_LIBSPEEX)
        $(IPKG_BUILD) $(IDIR_LIBSPEEX) $(PACKAGE_DIR)
 
 $(STAGING_DIR)/usr/lib/libspeex.so: $(PKG_BUILD_DIR)/.built
        mkdir -p $(STAGING_DIR)/usr/include

-       cp -fpR $(PKG_INSTALL_DIR)/usr/include/speex $(STAGING_DIR)/usr/include/
+       $(CP) $(PKG_INSTALL_DIR)/usr/include/speex $(STAGING_DIR)/usr/include/

        mkdir -p $(STAGING_DIR)/usr/lib
        mkdir -p $(STAGING_DIR)/usr/lib

-       cp -fp $(PKG_INSTALL_DIR)/usr/lib/libspeex.{a,so*} $(STAGING_DIR)/usr/lib/
+       $(CP) $(PKG_INSTALL_DIR)/usr/lib/libspeex.{a,so*} $(STAGING_DIR)/usr/lib/

        mkdir -p $(STAGING_DIR)/usr/lib/pkgconfig
        mkdir -p $(STAGING_DIR)/usr/lib/pkgconfig

-       cp -fp $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/speex.pc $(STAGING_DIR)/usr/lib/pkgconfig/
+       $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/speex.pc $(STAGING_DIR)/usr/lib/pkgconfig/
+       $(SED) 's,-I$${includedir},,g' $(STAGING_DIR)/usr/lib/pkgconfig/speex.pc
+       $(SED) 's,-L$${libdir},,g' $(STAGING_DIR)/usr/lib/pkgconfig/speex.pc

        touch $@
 
 install-dev: $(STAGING_DIR)/usr/lib/libspeex.so
        touch $@
 
 install-dev: $(STAGING_DIR)/usr/lib/libspeex.so


@@ -82,5 +84,5 @@ uninstall-dev:
                $(STAGING_DIR)/usr/lib/libspeex.{a,so*} \
                $(STAGING_DIR)/usr/lib/pkgconfig/speex.pc \
 
                $(STAGING_DIR)/usr/lib/libspeex.{a,so*} \
                $(STAGING_DIR)/usr/lib/pkgconfig/speex.pc \
 

-compile: install-dev
-clean: uninstall-dev
+compile-targets: install-dev
+clean-targets: uninstall-dev