Added wx200d, thanks Geoffrey Kruse, corrected typo in tmsnc/Config.in

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

diff --git a/openwrt/package/snort/Makefile b/openwrt/package/snort/Makefile
index aa6f91e..9f26550 100644 (file)
--- a/openwrt/package/snort/Makefile
+++ b/openwrt/package/snort/Makefile
@@ -7,16 +7,14 @@ PKG_VERSION:=2.3.3
 PKG_RELEASE:=1
 PKG_MD5SUM:=06bf140893e7cb120aaa9372d10a0100
 
-PKG_SOURCE_URL:= \
-       http://www.snort.org/dl/current/ \
-       http://nthill.free.fr/openwrt/sources/$(PKG_NAME)/
+PKG_SOURCE_URL:=http://www.snort.org/dl/current/
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_CAT:=zcat
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
 
-include $(TOPDIR)/package/templates.mk
+include $(TOPDIR)/package/rules.mk
 
 PKG_CONFIGURE_OPTS := \
        --target=$(GNU_TARGET_NAME) \
@@ -102,7 +100,7 @@ $(PKG_BUILD_DIR)/$(2): $(PKG_BUILD_DIR)/.prepared
                $(TARGET_CONFIGURE_OPTS) \
                CFLAGS="$(TARGET_CFLAGS)" \
                CPPFLAGS="-I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/usr/include/mysql" \
-               LDFLAGS="-L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/usr/lib/mysql" \
+               LDFLAGS="-L$(STAGING_DIR)/lib -L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/usr/lib/mysql" \
                ./configure \
                  $(PKG_CONFIGURE_OPTS) \
                  $$($(1)_CONFIGURE_OPTS) \
@@ -111,13 +109,11 @@ $(PKG_BUILD_DIR)/$(2): $(PKG_BUILD_DIR)/.prepared
        mv $(PKG_BUILD_DIR)/src/snort $(PKG_BUILD_DIR)/$(2)
 
 $$(IPKG_$(1)): $(PKG_BUILD_DIR)/.installed $(PKG_BUILD_DIR)/$(2)
-       rm -rf $$(IDIR_$(1))
-       $(SCRIPT_DIR)/make-ipkg-dir.sh $$(IDIR_$(1)) ./ipkg/$(2).control $(3) $(4)
        install -m0644 ./ipkg/snort.conffiles $$(IDIR_$(1))/CONTROL/conffiles
        install -d -m0755 $$(IDIR_$(1))/etc/default
-       install -m0644 ./ipkg/snort.default $$(IDIR_$(1))/etc/default/snort
+       install -m0644 ./files/snort.default $$(IDIR_$(1))/etc/default/snort
        install -d -m0755 $$(IDIR_$(1))/etc/init.d
-       install -m0755 ./ipkg/snort.init $$(IDIR_$(1))/etc/init.d/snort
+       install -m0755 ./files/snort.init $$(IDIR_$(1))/etc/init.d/snort
        install -d -m0755 $$(IDIR_$(1))/etc/snort
        install -m0644 $(PKG_BUILD_DIR)/etc/snort.conf $$(IDIR_$(1))/etc/snort/
        install -m0644 $(PKG_BUILD_DIR)/etc/classification.config $$(IDIR_$(1))/etc/snort/
@@ -144,10 +140,11 @@ $(eval $(call PKG_build,SNORT_MYSQL,snort-mysql,$(PKG_VERSION)-$(PKG_RELEASE),$(
 $(eval $(call PKG_build,SNORT_PGSQL,snort-pgsql,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
 $(eval $(call PKG_build,SNORT_CUSTOM,snort-custom,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
 
-include $(TOPDIR)/package/rules.mk
+$(PKG_BUILD_DIR)/.configured:
+       touch $@
 
 $(PKG_BUILD_DIR)/.built: $(BUILD_TARGETS)
-       touch $(PKG_BUILD_DIR)/.built
+       touch $@
 
 $(PKG_BUILD_DIR)/.installed: $(PKG_BUILD_DIR)/.built
        mkdir -p $(PKG_INSTALL_DIR)