add tcpdump depend on libpcap

[openwrt.git] / package / pcre / Makefile

diff --git a/package/pcre/Makefile b/package/pcre/Makefile
index 31be6b8..2ff5492 100644 (file)
--- a/package/pcre/Makefile
+++ b/package/pcre/Makefile
@@ -7,7 +7,8 @@ PKG_VERSION := 5.0
 PKG_RELEASE := 3
 PKG_MD5SUM := 53976b62032fd5c76678274e5fd196b4
 
 PKG_RELEASE := 3
 PKG_MD5SUM := 53976b62032fd5c76678274e5fd196b4
 

-PKG_SOURCE_SITE := ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/
+PKG_SOURCE_SITE := ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/ \
+       http://nthill.free.fr/openwrt/sources/$(PKG_NAME)/

 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)


@@ -22,15 +23,16 @@ $(DL_DIR)/$(PKG_SOURCE_FILE):
 $(PKG_BUILD_DIR)/ipkg/rules: $(DL_DIR)/$(PKG_SOURCE_FILE)
        mkdir -p $(TOOL_BUILD_DIR)
        $(PKG_SOURCE_CAT) $(DL_DIR)/$(PKG_SOURCE_FILE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
 $(PKG_BUILD_DIR)/ipkg/rules: $(DL_DIR)/$(PKG_SOURCE_FILE)
        mkdir -p $(TOOL_BUILD_DIR)
        $(PKG_SOURCE_CAT) $(DL_DIR)/$(PKG_SOURCE_FILE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -

-       $(PATCH) $(PKG_BUILD_DIR) . $(PKG_NAME)-\*.diff
+#      $(PATCH) $(PKG_BUILD_DIR) ./patches
+       cp -fpR ./ipkg $(PKG_BUILD_DIR)/

        chmod a+x $(PKG_BUILD_DIR)/ipkg/rules
        chmod a+x $(PKG_BUILD_DIR)/ipkg/rules

+       touch $(PKG_BUILD_DIR)/ipkg/rules

 
 $(PKG_IPK): $(PKG_BUILD_DIR)/ipkg/rules
        cd $(PKG_BUILD_DIR); \
 
 $(PKG_IPK): $(PKG_BUILD_DIR)/ipkg/rules
        cd $(PKG_BUILD_DIR); \

-       ipkg/rules \
-         TOPDIR="$(TOPDIR)" IPKG_RULES_INC="$(TOPDIR)/rules.mk" \
-         INSTALL_DIR="$(STAGING_DIR)" \
-        package
+       TOPDIR="$(TOPDIR)" IPKG_RULES_INC="$(TOPDIR)/rules.mk" \
+       INSTALL_DIR="$(STAGING_DIR)" \
+       ./ipkg/rules package

 
 $(IPKG_STATE_DIR)/info/lib$(PKG_NAME).list: $(PKG_IPK)
        $(IPKG) install $(PKG_IPK)
 
 $(IPKG_STATE_DIR)/info/lib$(PKG_NAME).list: $(PKG_IPK)
        $(IPKG) install $(PKG_IPK)


@@ -42,9 +44,8 @@ install: $(IPKG_STATE_DIR)/info/lib$(PKG_NAME).list
 
 clean:
        -cd $(PKG_BUILD_DIR); \
 
 clean:
        -cd $(PKG_BUILD_DIR); \

-       ipkg/rules \
-         TOPDIR="$(TOPDIR)" IPKG_RULES_INC="$(TOPDIR)/rules.mk" \
-         INSTALL_DIR="$(STAGING_DIR)" \
-        clean
+       TOPDIR="$(TOPDIR)" IPKG_RULES_INC="$(TOPDIR)/rules.mk" \
+       INSTALL_DIR="$(STAGING_DIR)" \
+       ./ipkg/rules clean

        rm -rf $(PKG_BUILD_DIR)
        rm -r $(PKG_IPK)
        rm -rf $(PKG_BUILD_DIR)
        rm -r $(PKG_IPK)