avoid using a reserved word as a variable name

[openwrt.git] / package / dropbear / Makefile

diff --git a/package/dropbear/Makefile b/package/dropbear/Makefile
index 133e67a..f5e9b15 100644 (file)
--- a/package/dropbear/Makefile
+++ b/package/dropbear/Makefile
@@ -1,3 +1,9 @@
+# 
+# Copyright (C) 2006 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
 # $Id$
 
 include $(TOPDIR)/rules.mk
@@ -12,7 +18,7 @@ PKG_SOURCE_URL:=http://matt.ucc.asn.au/dropbear/releases/
 PKG_MD5SUM:=ca8e53a766faec831882831364568421
 PKG_CAT:=zcat
 
-include $(TOPDIR)/package/rules.mk
+include $(INCLUDE_DIR)/package.mk
 
 define Package/dropbear
 SECTION:=base
@@ -25,58 +31,55 @@ endef
 
 define Package/dropbearconvert
 $(call Package/dropbear)
-DEFAULT:=m
 TITLE:=Utility for converting SSH keys
+DEFAULT:=m if ALL
 DESCRIPTION:=Utility for converting SSH keys
-DEPENDS:=zlib
 endef
 
 define Build/Configure
        $(SED) 's,^/\* #define PKG_MULTI.*,#define PKG_MULTI,g' $(PKG_BUILD_DIR)/options.h
        $(SED) 's,^#define DO_HOST_LOOKUP,/* & */,g' $(PKG_BUILD_DIR)/options.h
        (cd $(PKG_BUILD_DIR); rm -rf config.cache; \
-               autoconf; \
                $(TARGET_CONFIGURE_OPTS) \
-               CFLAGS="$(TARGET_CFLAGS) -I$(STAGING_DIR)/usr/include" \
-               LDFLAGS="-L$(STAGING_DIR)/usr/lib" \
+               CFLAGS="$(TARGET_CFLAGS)" \
                ./configure \
-               --target=$(GNU_TARGET_NAME) \
-               --host=$(GNU_TARGET_NAME) \
-               --build=$(GNU_HOST_NAME) \
-               --program-prefix="" \
-               --program-suffix="" \
-               --prefix=/usr \
-               --exec-prefix=/usr \
-               --bindir=/usr/bin \
-               --datadir=/usr/share \
-               --includedir=/usr/include \
-               --infodir=/usr/share/info \
-               --libdir=/usr/lib \
-               --libexecdir=/usr/lib \
-               --localstatedir=/var \
-               --mandir=/usr/share/man \
-               --sbindir=/usr/sbin \
-               --sysconfdir=/etc \
-               $(DISABLE_LARGEFILE) \
-               $(DISABLE_NLS) \
-               --with-shared \
-               --disable-pam \
-               --enable-openpty \
-               --enable-syslog \
-               --disable-shadow \
-               --disable-lastlog \
-               --disable-utmp \
-               --disable-utmpx \
-               --disable-wtmp \
-               --disable-wtmpx \
-               --disable-loginfunc \
-               --disable-pututline \
-               --disable-pututxline \
-               --disable-zlib \
+                       --target=$(GNU_TARGET_NAME) \
+                       --host=$(GNU_TARGET_NAME) \
+                       --build=$(GNU_HOST_NAME) \
+                       --program-prefix="" \
+                       --program-suffix="" \
+                       --prefix=/usr \
+                       --exec-prefix=/usr \
+                       --bindir=/usr/bin \
+                       --datadir=/usr/share \
+                       --includedir=/usr/include \
+                       --infodir=/usr/share/info \
+                       --libdir=/usr/lib \
+                       --libexecdir=/usr/lib \
+                       --localstatedir=/var \
+                       --mandir=/usr/share/man \
+                       --sbindir=/usr/sbin \
+                       --sysconfdir=/etc \
+                       $(DISABLE_LARGEFILE) \
+                       $(DISABLE_NLS) \
+                       --with-shared \
+                       --disable-pam \
+                       --enable-openpty \
+                       --enable-syslog \
+                       --disable-shadow \
+                       --disable-lastlog \
+                       --disable-utmp \
+                       --disable-utmpx \
+                       --disable-wtmp \
+                       --disable-wtmpx \
+                       --disable-loginfunc \
+                       --disable-pututline \
+                       --disable-pututxline \
+                       --disable-zlib \
        );
 endef
 
-define Buid/Compile
+define Build/Compile
        $(MAKE) -C $(PKG_BUILD_DIR) \
                LD=$(TARGET_CC) \
                PROGRAMS="dropbear dbclient dropbearkey scp" \
@@ -87,21 +90,21 @@ define Buid/Compile
 endef
        
 define Package/dropbear/install
-       mkdir -p $(1)/usr/bin
-       mkdir -p $(1)/usr/sbin
-       install -m 755 $(PKG_BUILD_DIR)/dropbearmulti \
+       install -d -m0755 $(1)/usr/sbin
+       install -m0755 $(PKG_BUILD_DIR)/dropbearmulti \
                $(1)/usr/sbin/dropbear
+       install -d -m0755 $(1)/usr/bin
        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/
+       install -d -m0755 $(1)/etc/init.d
+       install -m0755 ./files/dropbear.init $(1)/etc/init.d/S50dropbear
 endef
 
 define Package/dropbearconvert/install
-       mkdir -p $(1)/usr/bin
-       install -m 755 $(PKG_BUILD_DIR)/dropbearconvert \
+       install -d -m0755 $(1)/usr/bin
+       install -m0755 $(PKG_BUILD_DIR)/dropbearconvert \
                $(1)/usr/bin/dropbearconvert
 endef