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

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

diff --git a/openwrt/package/libpthread/Makefile b/openwrt/package/libpthread/Makefile
index 371245f..ae5693d 100644 (file)
--- a/openwrt/package/libpthread/Makefile
+++ b/openwrt/package/libpthread/Makefile
@@ -2,35 +2,33 @@
 
 include $(TOPDIR)/rules.mk
 
 
 include $(TOPDIR)/rules.mk
 

-PKG_NAME := libpthread
-PKG_VERSION := 0.9.27
-PKG_RELEASE := 1
+PKG_NAME:=libpthread
+PKG_VERSION:=0.9.27
+PKG_RELEASE:=1

 
 

-PKG_SOURCE_DIR := $(PKG_NAME)-$(PKG_VERSION)
-PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_SOURCE_DIR)
-PKG_IPK := $(PACKAGE_DIR)/$(PKG_NAME)_$(PKG_VERSION)-$(PKG_RELEASE)_$(ARCH).ipk
-PKG_IPK_DIR :=$(PKG_BUILD_DIR)/ipkg/
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
+PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
+
+include $(TOPDIR)/package/rules.mk
+
+$(eval $(call PKG_template,LIBPTHREAD,libpthread,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))

 
 .NOTPARALLEL:
 
 
 .NOTPARALLEL:
 

-$(PKG_IPK): $(STAGING_DIR)/lib/libpthread.so
-       rm -rf $(PKG_BUILD_DIR)
-       $(SCRIPT_DIR)/make-ipkg-dir.sh $(PKG_IPK_DIR) $(PKG_NAME).control $(PKG_VERSION)-$(PKG_RELEASE) $(ARCH)
-       mkdir -p $(PKG_IPK_DIR)/lib
-       cp -fp $(STAGING_DIR)/lib/libpthread.so.* $(PKG_IPK_DIR)/lib/
-       cp -fp $(STAGING_DIR)/lib/libpthread-*.so $(PKG_IPK_DIR)/lib/
-       $(STRIP) $(PKG_IPK_DIR)/lib/*
-       mkdir -p $(PACKAGE_DIR)
-       $(IPKG_BUILD) $(PKG_IPK_DIR) $(PACKAGE_DIR)
-
-$(IPKG_STATE_DIR)/info/$(PKG_NAME).list: $(PKG_IPK)
-       $(IPKG) install $(PKG_IPK)
-
-source:
-prepare:
-compile: $(PKG_IPK)
-install: $(IPKG_STATE_DIR)/info/$(PKG_NAME).list
-
-clean:
-       rm -rf $(PKG_BUILD_DIR)
-       rm -f $(PKG_IPK)
+$(PKG_BUILD_DIR)/.prepared:
+       mkdir -p $(PKG_BUILD_DIR)
+       touch $(PKG_BUILD_DIR)/.prepared
+
+$(PKG_BUILD_DIR)/.configured: $(PKG_BUILD_DIR)/.prepared
+       touch $(PKG_BUILD_DIR)/.configured
+
+$(PKG_BUILD_DIR)/.built: $(PKG_BUILD_DIR)/.configured
+       touch $(PKG_BUILD_DIR)/.built
+
+$(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)
+