remove unneeded autoconf call and flags, rename S50dropbear to dropbear.init, normalize Makefile: - indent configure invocation, - use "install -d" instead of "mkdir -p".

SVN-Revision: 3995
owl
Nicolas Thill 2006-06-18 18:22:24 +00:00
parent 5bdf5b84cb
commit b418646d03
2 changed files with 41 additions and 43 deletions

View File

@ -34,10 +34,8 @@ define Build/Configure
$(SED) 's,^/\* #define PKG_MULTI.*,#define PKG_MULTI,g' $(PKG_BUILD_DIR)/options.h $(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 $(SED) 's,^#define DO_HOST_LOOKUP,/* & */,g' $(PKG_BUILD_DIR)/options.h
(cd $(PKG_BUILD_DIR); rm -rf config.cache; \ (cd $(PKG_BUILD_DIR); rm -rf config.cache; \
autoconf; \
$(TARGET_CONFIGURE_OPTS) \ $(TARGET_CONFIGURE_OPTS) \
CFLAGS="$(TARGET_CFLAGS) -I$(STAGING_DIR)/usr/include" \ CFLAGS="$(TARGET_CFLAGS)" \
LDFLAGS="-L$(STAGING_DIR)/usr/lib" \
./configure \ ./configure \
--target=$(GNU_TARGET_NAME) \ --target=$(GNU_TARGET_NAME) \
--host=$(GNU_TARGET_NAME) \ --host=$(GNU_TARGET_NAME) \
@ -86,21 +84,21 @@ define Build/Compile
endef endef
define Package/dropbear/install define Package/dropbear/install
mkdir -p $(1)/usr/bin install -d -m0755 $(1)/usr/sbin
mkdir -p $(1)/usr/sbin install -m0755 $(PKG_BUILD_DIR)/dropbearmulti \
install -m 755 $(PKG_BUILD_DIR)/dropbearmulti \
$(1)/usr/sbin/dropbear $(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/scp
ln -sf ../sbin/dropbear $(1)/usr/bin/ssh ln -sf ../sbin/dropbear $(1)/usr/bin/ssh
ln -sf ../sbin/dropbear $(1)/usr/bin/dbclient ln -sf ../sbin/dropbear $(1)/usr/bin/dbclient
ln -sf ../sbin/dropbear $(1)/usr/bin/dropbearkey ln -sf ../sbin/dropbear $(1)/usr/bin/dropbearkey
mkdir -p $(1)/etc/init.d install -d -m0755 $(1)/etc/init.d
install -m 755 ./files/S50dropbear $(1)/etc/init.d/ install -m0755 ./files/dropbear.init $(1)/etc/init.d/S50dropbear
endef endef
define Package/dropbearconvert/install define Package/dropbearconvert/install
mkdir -p $(1)/usr/bin install -d -m0755 $(1)/usr/bin
install -m 755 $(PKG_BUILD_DIR)/dropbearconvert \ install -m0755 $(PKG_BUILD_DIR)/dropbearconvert \
$(1)/usr/bin/dropbearconvert $(1)/usr/bin/dropbearconvert
endef endef