improve dependency handling, fix some package makefile bugs

[openwrt-10.03/.git] / package / dropbear / Makefile

diff --git a/package/dropbear/Makefile b/package/dropbear/Makefile
index ea452f2f622310f8f8b76e9e31de2c6386d3b1cf..28cdd15f7cf46231fc061f8b7d1255a7ea699f41 100644 (file)
--- a/package/dropbear/Makefile
+++ b/package/dropbear/Makefile
@@ -25,10 +25,9 @@ endef
 
 define Package/dropbearconvert
 $(call Package/dropbear)
-DEFAULT:=m
 TITLE:=Utility for converting SSH keys
 DESCRIPTION:=Utility for converting SSH keys
-DEPENDS:=zlib
+DEPENDS:=+zlib
 endef
 
 define Build/Configure
@@ -76,7 +75,7 @@ define Build/Configure
        );
 endef
 
-define Buid/Compile
+define Build/Compile
        $(MAKE) -C $(PKG_BUILD_DIR) \
                LD=$(TARGET_CC) \
                PROGRAMS="dropbear dbclient dropbearkey scp" \
@@ -87,22 +86,22 @@ define Buid/Compile
 endef
        
 define Package/dropbear/install
-       mkdir -p $(IDIR_DROPBEAR)/usr/bin
-       mkdir -p $(IDIR_DROPBEAR)/usr/sbin
+       mkdir -p $(1)/usr/bin
+       mkdir -p $(1)/usr/sbin
        install -m 755 $(PKG_BUILD_DIR)/dropbearmulti \
-               $(IDIR_DROPBEAR)/usr/sbin/dropbear
-       ln -sf ../sbin/dropbear $(IDIR_DROPBEAR)/usr/bin/scp
-       ln -sf ../sbin/dropbear $(IDIR_DROPBEAR)/usr/bin/ssh
-       ln -sf ../sbin/dropbear $(IDIR_DROPBEAR)/usr/bin/dbclient
-       ln -sf ../sbin/dropbear $(IDIR_DROPBEAR)/usr/bin/dropbearkey
-       mkdir -p $(IDIR_DROPBEAR)/etc/init.d
-       install -m 755 ./files/S50dropbear $(IDIR_DROPBEAR)/etc/init.d/
+               $(1)/usr/sbin/dropbear
+       ln -sf ../sbin/dropbear $(1)/usr/bin/scp
+       ln -sf ../sbin/dropbear $(1)/usr/bin/ssh
+       ln -sf ../sbin/dropbear $(1)/usr/bin/dbclient
+       ln -sf ../sbin/dropbear $(1)/usr/bin/dropbearkey
+       mkdir -p $(1)/etc/init.d
+       install -m 755 ./files/S50dropbear $(1)/etc/init.d/
 endef
 
 define Package/dropbearconvert/install
-       mkdir -p $(IDIR_DBCONVERT)/usr/bin
+       mkdir -p $(1)/usr/bin
        install -m 755 $(PKG_BUILD_DIR)/dropbearconvert \
-               $(IDIR_DBCONVERT)/usr/bin/dropbearconvert
+               $(1)/usr/bin/dropbearconvert
 endef
 
 $(eval $(call BuildPackage,dropbear))