X-Git-Url: http://git.rohieb.name/openwrt.git/blobdiff_plain/e7c015c9d458523a77c2eb63411a0482683d2abf..895299e89d2d8244212d60940574b790c1dddd28:/openwrt/package/snort/Makefile

diff --git a/openwrt/package/snort/Makefile b/openwrt/package/snort/Makefile
index aa6f91eae..630ac127e 100644
--- 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) \
@@ -144,10 +142,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)