Add fix from whiterussian

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

diff --git a/openwrt/package/libpthread/Makefile b/openwrt/package/libpthread/Makefile
index c334692..e74eda7 100644 (file)
--- a/openwrt/package/libpthread/Makefile
+++ b/openwrt/package/libpthread/Makefile
@@ -7,30 +7,28 @@ PKG_VERSION:=0.9.27
 PKG_RELEASE:=1
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_RELEASE:=1
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)

+PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install

 
 

-IPKG_LIBPTHREAD:=$(PACKAGE_DIR)/$(PKG_NAME)_$(PKG_VERSION)-$(PKG_RELEASE)_$(ARCH).ipk
-IDIR_LIBPTHREAD:=$(PKG_BUILD_DIR)/ipkg/$(PKG_NAME)
-INFO_LIBPTHREAD:=$(IPKG_STATE_DIR)/info/$(PKG_NAME).list
+include $(TOPDIR)/package/rules.mk
+
+$(eval $(call PKG_template,LIBPTHREAD,libpthread,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))

 
 .NOTPARALLEL:
 
 
 .NOTPARALLEL:
 

-$(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)
-       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/
-       $(STRIP) $(IDIR_LIBPTHREAD)/lib/lib*.so*
-       mkdir -p $(PACKAGE_DIR)
-       $(IPKG_BUILD) $(IDIR_LIBPTHREAD) $(PACKAGE_DIR)
+$(PKG_BUILD_DIR)/.prepared:
+       mkdir -p $(PKG_BUILD_DIR)
+       touch $@

 
 

-$(IPKG_STATE_DIR)/info/$(PKG_NAME).list: $(IPKG_LIBPTHREAD)
-       $(IPKG) install $(IPKG_LIBPTHREAD)
+$(PKG_BUILD_DIR)/.configured: $(PKG_BUILD_DIR)/.prepared
+       touch $@

 
 

-source:
-prepare:
-compile: $(IPKG_LIBPTHREAD)
-install: $(INFO_LIBPTHREAD)
+$(PKG_BUILD_DIR)/.built: $(PKG_BUILD_DIR)/.configured
+       touch $@
+
+$(IPKG_LIBPTHREAD):
+       mkdir -p $(IDIR_LIBPTHREAD)/lib
+       cp -fpR $(STAGING_DIR)/lib/libpthread.so.* $(IDIR_LIBPTHREAD)/lib/
+       cp -fpR $(STAGING_DIR)/lib/libpthread-*.so $(IDIR_LIBPTHREAD)/lib/
+       $(RSTRIP) $(IDIR_LIBPTHREAD)
+       $(IPKG_BUILD) $(IDIR_LIBPTHREAD) $(PACKAGE_DIR)

 
 

-clean:
-       rm -rf $(PKG_BUILD_DIR) $(IPKG_LIBPTHREAD)