Uniformize package Makefile, move ipkg related files to ./ipkg

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

diff --git a/openwrt/package/libpthread/Makefile b/openwrt/package/libpthread/Makefile
index c334692..7215a45 100644 (file)
--- a/openwrt/package/libpthread/Makefile
+++ b/openwrt/package/libpthread/Makefile
@@ -16,10 +16,10 @@ INFO_LIBPTHREAD:=$(IPKG_STATE_DIR)/info/$(PKG_NAME).list
 
 $(IPKG_LIBPTHREAD): $(STAGING_DIR)/lib/libpthread.so
        rm -rf $(PKG_BUILD_DIR)
 
 $(IPKG_LIBPTHREAD): $(STAGING_DIR)/lib/libpthread.so
        rm -rf $(PKG_BUILD_DIR)

-       $(SCRIPT_DIR)/make-ipkg-dir.sh $(IDIR_LIBPTHREAD) $(PKG_NAME).control $(PKG_VERSION)-$(PKG_RELEASE) $(ARCH)
+       $(SCRIPT_DIR)/make-ipkg-dir.sh $(IDIR_LIBPTHREAD) ./ipkg/$(PKG_NAME).control $(PKG_VERSION)-$(PKG_RELEASE) $(ARCH)

        mkdir -p $(IDIR_LIBPTHREAD)/lib
        mkdir -p $(IDIR_LIBPTHREAD)/lib

-       cp -fp $(STAGING_DIR)/lib/libpthread.so.* $(IDIR_LIBPTHREAD)/lib/
-       cp -fp $(STAGING_DIR)/lib/libpthread-*.so $(IDIR_LIBPTHREAD)/lib/
+       cp -fpR $(STAGING_DIR)/lib/libpthread.so.* $(IDIR_LIBPTHREAD)/lib/
+       cp -fpR $(STAGING_DIR)/lib/libpthread-*.so $(IDIR_LIBPTHREAD)/lib/

        $(STRIP) $(IDIR_LIBPTHREAD)/lib/lib*.so*
        mkdir -p $(PACKAGE_DIR)
        $(IPKG_BUILD) $(IDIR_LIBPTHREAD) $(PACKAGE_DIR)
        $(STRIP) $(IDIR_LIBPTHREAD)/lib/lib*.so*
        mkdir -p $(PACKAGE_DIR)
        $(IPKG_BUILD) $(IDIR_LIBPTHREAD) $(PACKAGE_DIR)