X-Git-Url: http://git.ozo.com/?p=openwrt-10.03%2F.git;a=blobdiff_plain;f=package%2Fdropbear%2FMakefile;h=d43e70cfce7f35dc8c8fdbae5bb60a7fa818166d;hp=36548877db25c57343bc517cab16a6dda96239c1;hb=d1085366f678135eb48a492ab5b1b225c8ed7484;hpb=b54671ed4165a13cbbcd50b07c32ac8e2ce9bd1e

diff --git a/package/dropbear/Makefile b/package/dropbear/Makefile
index 36548877d..d43e70cfc 100644
--- a/package/dropbear/Makefile
+++ b/package/dropbear/Makefile
@@ -16,6 +16,7 @@ PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 include $(TOPDIR)/package/rules.mk
 
 $(eval $(call PKG_template,DROPBEAR,$(PKG_NAME),$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
+$(eval $(call PKG_template,DBCONVERT,dropbearconvert,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
 
 $(PKG_BUILD_DIR)/.configured:
 	$(SED) 's,^/\* #define PKG_MULTI.*,#define PKG_MULTI,g' $(PKG_BUILD_DIR)/options.h
@@ -58,15 +59,25 @@ $(PKG_BUILD_DIR)/.configured:
 		--disable-loginfunc \
 		--disable-pututline \
 		--disable-pututxline \
+		--disable-zlib \
 	);
 	touch $@
 
 $(PKG_BUILD_DIR)/.built:
 	$(MAKE) -C $(PKG_BUILD_DIR) \
 		LD=$(TARGET_CC) \
-		PROGRAMS="dropbear dbclient dropbearkey dropbearconvert scp" \
+		PROGRAMS="dropbear dbclient dropbearkey scp" \
 		MULTI=1 SCPPROGRESS=1
+	$(MAKE) -C $(PKG_BUILD_DIR) \
+		LD=$(TARGET_CC) \
+		PROGRAMS="dropbearconvert"
 	touch $@
+	
+$(IPKG_DBCONVERT):
+	mkdir -p $(IDIR_DBCONVERT)/usr/bin
+	install -m 755 $(PKG_BUILD_DIR)/dropbearconvert \
+		$(IDIR_DBCONVERT)/usr/bin/dropbearconvert
+	$(IPKG_BUILD) $(IDIR_DBCONVERT) $(PACKAGE_DIR)
 
 $(IPKG_DROPBEAR):
 	mkdir -p $(IDIR_DROPBEAR)/usr/bin
@@ -78,7 +89,6 @@ $(IPKG_DROPBEAR):
 	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
-	ln -sf ../sbin/dropbear $(IDIR_DROPBEAR)/usr/bin/dropbearconvert
 	mkdir -p $(IDIR_DROPBEAR)/etc/init.d
 	install -m 755 ./files/S50dropbear $(IDIR_DROPBEAR)/etc/init.d/
 	$(IPKG_BUILD) $(IDIR_DROPBEAR) $(PACKAGE_DIR)