X-Git-Url: http://git.openwrt.org/?a=blobdiff_plain;f=net%2Famwall%2FMakefile;h=8c415d11cff92cbed71f7f6653b5fe196dda699d;hb=f781213793c699d4906a7f5a3647c457c4851b8e;hp=f2c696fe582b4c7962aa348fec19c49100fc1122;hpb=faeb9d017af7a32b6d3ae82122cd9f89c087ee66;p=openwrt%2Fsvn-archive%2Farchive.git

diff --git a/net/amwall/Makefile b/net/amwall/Makefile
index f2c696fe58..8c415d11cf 100644
--- a/net/amwall/Makefile
+++ b/net/amwall/Makefile
@@ -4,7 +4,6 @@
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #
-# $Id$
 
 include $(TOPDIR)/rules.mk
 
@@ -15,10 +14,6 @@ PKG_RELEASE:=1
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=ftp://ftp.amselinux.net/source/
 PKG_MD5SUM:=a8b6438e7fd9ccadc9f68824ae62349c
-PKG_CAT:=bzcat
-
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
 
 include $(INCLUDE_DIR)/package.mk
 
@@ -28,28 +23,28 @@ define Package/amwall
   DEPENDS:=+libamsel
   TITLE:=PF to iptables
   URL:=http://www.amselinux.net/
+  SUBMENU:=firewall
 endef
 
 define Build/Compile
-	rm -rf $(PKG_INSTALL_DIR)
-	mkdir -p $(PKG_INSTALL_DIR)
 	$(MAKE) -C $(PKG_BUILD_DIR) \
 		$(TARGET_CONFIGURE_OPTS) \
 		V= \
 		LDIR="$(PKG_BUILD_DIR)" \
 		AMSEL_INCLUDE="$(STAGING_DIR)/usr/include" \
-		OPT_LDFLAGS="-L$(STAGING_DIR)/usr/lib" \
+		OPT_LDFLAGS="$(TARGET_LDFLAGS)" \
 		PREFIX="/usr" \
 		CONFIG="$(PKG_BUILD_DIR)/etc/amsel" \
 		DESTDIR="$(PKG_INSTALL_DIR)" \
+		SHELL="/bin/bash" \
 		all install
 endef
 
 define Package/amwall/install
 	$(INSTALL_DIR) $(1)/usr/bin
-	$(CP) $(PKG_INSTALL_DIR)/usr/bin/* $(1)/usr/bin/
+	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/* $(1)/usr/bin/
 	$(INSTALL_DIR) $(1)/usr/sbin
-	$(CP) $(PKG_INSTALL_DIR)/usr/sbin/* $(1)/usr/sbin/
+	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/* $(1)/usr/sbin/
 	$(INSTALL_DIR) $(1)/etc/amsel
 	$(CP) $(PKG_INSTALL_DIR)/etc/amsel* $(1)/etc/
 endef