X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fsvn-archive%2Farchive.git;a=blobdiff_plain;f=net%2Fmini_snmpd%2FMakefile;h=0b99189960ef6bf75dc0bfe04ef25b8fd5dcae8f;hp=c49b6eb3c983b4c1932e2d1a67f6e7010120c202;hb=7e3ebfc9904223a7776cedfe19a202f3db871938;hpb=e674e031535b6f111ab78c7253a9b3291f8f9889

diff --git a/net/mini_snmpd/Makefile b/net/mini_snmpd/Makefile
index c49b6eb3c9..0b99189960 100644
--- a/net/mini_snmpd/Makefile
+++ b/net/mini_snmpd/Makefile
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2010 OpenWrt.org
+# Copyright (C) 2009-2010 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -9,36 +9,50 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=mini_snmpd
 PKG_VERSION:=1.0
-PKG_RELEASE:=6
+PKG_RELEASE:=7
 
 PKG_SOURCE:=mini_snmpd.tar.gz
 PKG_SOURCE_URL:=http://members.aon.at/linuxfreak/linux/
 PKG_MD5SUM:=13f2202ff01ff6b6463989f34f453063
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)
 
 include $(INCLUDE_DIR)/package.mk
 
+define Package/mini-snmpd/Default
+  TITLE:=SNMP server for embedded systems
+  URL:=http://members.aon.at/linuxfreak/linux/mini_snmpd.html
+endef
+
 define Package/mini-snmpd
+$(call Package/mini-snmpd/Default)
   SECTION:=net
   CATEGORY:=Network
-  TITLE:=SNMP server for embedded systems
-  URL:=http://members.aon.at/linuxfreak/linux/mini_snmpd.html
-  DEPENDS:=+IPV6:kmod-ipv6
+  TITLE+= (IPv4 only)
+  VARIANT:=ipv4
 endef
 
+define Package/mini-snmpd6
+$(call Package/mini-snmpd/Default)
+  SECTION:=ipv6
+  CATEGORY:=IPv6
+  TITLE+= (IPv6 only)
+  VARIANT:=ipv6
+  DEPENDS:=+kmod-ipv6
+endef
+
+
+PKG_OFLAGS:=$(TARGET_CFLAGS) -DSYSLOG
+ifeq ($(BUILD_VARIANT),ipv6)
+  PKG_OFLAGS+= -DIPV6
+endif
 
 MAKE_FLAGS+= \
+	OFLAGS="$(PKG_OFLAGS)" \
 	STRIP="/bin/true" \
 	INSTALL_ROOT="$(PKG_INSTALL_DIR)" \
 	mini_snmpd install
 
-ifeq ($(CONFIG_IPV6),y)
-MAKE_FLAGS+= OFLAGS="$(TARGET_CFLAGS) -DSYSLOG -DIPV6"
-else
-MAKE_FLAGS+= OFLAGS="$(TARGET_CFLAGS) -DSYSLOG"
-endif
-
 define Package/mini-snmpd/install
 	$(INSTALL_DIR) $(1)/usr/bin
 	$(CP) $(PKG_INSTALL_DIR)/sbin/mini_snmpd $(1)/usr/bin/
@@ -48,4 +62,7 @@ define Package/mini-snmpd/install
 	$(INSTALL_BIN) ./files/mini_snmpd.init $(1)/etc/init.d/mini_snmpd
 endef
 
+Package/mini-snmpd6/install=$(Package/mini-snmpd/install)
+
 $(eval $(call BuildPackage,mini-snmpd))
+$(eval $(call BuildPackage,mini-snmpd6))