move another DEFAULT:=y and fix a dependency bug

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6097 3c298f89-4303-0410-b956-a3cf2f4a3e73

diff --git a/package/yamonenv/Makefile b/package/yamonenv/Makefile
index b26e071..15afda5 100644 (file)
--- a/package/yamonenv/Makefile
+++ b/package/yamonenv/Makefile
@@ -24,8 +24,7 @@ include $(INCLUDE_DIR)/package.mk
 define Package/yamonenv
   SECTION:=utils
   CATEGORY:=Utilities
-  DEFAULT:=y if LINUX_2_6_AU1000
-  DEPENDS:=@LINUX_2_6_AU1000@
+  DEPENDS:=@LINUX_2_6_AU1000
   TITLE:=YAMON configuration utility
   URL:=http://meshcube.org/nylon/stable/sources/
 endef

diff --git a/target/linux/au1000-2.6/Makefile b/target/linux/au1000-2.6/Makefile
index 2f2a92b..25fc776 100644 (file)
--- a/target/linux/au1000-2.6/Makefile
+++ b/target/linux/au1000-2.6/Makefile
@@ -17,6 +17,7 @@ define Target/Description
 endef
 
 include $(INCLUDE_DIR)/kernel-build.mk
+DEFAULT_PACKAGES += yamonenv
 
 define Kernel/BuildImage
        $(call Kernel/BuildImage/Default)