aboutsummaryrefslogtreecommitdiff
path: root/package/openssh
diff options
context:
space:
mode:
authorGravatar Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>2007-04-16 18:51:20 +0000
committerGravatar Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>2007-04-16 18:51:20 +0000
commit41decaa9fea506c08f210f411710951f4920b91d (patch)
treef84d747585e23d96842ff43f272016e2d0e2d0ef /package/openssh
parent0f620a15c57ceceabd761429a03240ccf97fd3c7 (diff)
downloadbuildroot-41decaa9fea506c08f210f411710951f4920b91d.tar.gz
buildroot-41decaa9fea506c08f210f411710951f4920b91d.tar.bz2
- install some more stuff that goes into staging_dir into the proper place.
First hunk of fixes for bug #1290
Diffstat (limited to 'package/openssh')
-rw-r--r--package/openssh/openssh.mk10
1 files changed, 6 insertions, 4 deletions
diff --git a/package/openssh/openssh.mk b/package/openssh/openssh.mk
index 607e24c07b..fb31773959 100644
--- a/package/openssh/openssh.mk
+++ b/package/openssh/openssh.mk
@@ -14,10 +14,11 @@ $(DL_DIR)/$(OPENSSH_SOURCE):
$(OPENSSH_DIR)/.unpacked: $(DL_DIR)/$(OPENSSH_SOURCE)
$(ZCAT) $(DL_DIR)/$(OPENSSH_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
toolchain/patch-kernel.sh $(OPENSSH_DIR) package/openssh/ openssh\*.patch
- touch $(OPENSSH_DIR)/.unpacked
+ $(CONFIG_UPDATE) $(@D)
+ touch $@
$(OPENSSH_DIR)/.configured: $(OPENSSH_DIR)/.unpacked
- (cd $(OPENSSH_DIR); rm -rf config.cache; autoconf; \
+ (cd $(OPENSSH_DIR); rm -rf config.cache; autoconf ; \
$(TARGET_CONFIGURE_OPTS) \
LD=$(TARGET_CROSS)gcc \
CFLAGS="$(TARGET_CFLAGS)" \
@@ -37,14 +38,14 @@ $(OPENSSH_DIR)/.configured: $(OPENSSH_DIR)/.unpacked
--localstatedir=/var \
--mandir=/usr/man \
--infodir=/usr/info \
- --includedir=$(STAGING_DIR)/include \
+ --includedir=$(STAGING_DIR)/usr/include \
--disable-lastlog --disable-utmp \
--disable-utmpx --disable-wtmp --disable-wtmpx \
--without-x \
$(DISABLE_NLS) \
$(DISABLE_LARGEFILE) \
);
- touch $(OPENSSH_DIR)/.configured
+ touch $@
$(OPENSSH_DIR)/ssh: $(OPENSSH_DIR)/.configured
$(MAKE) CC=$(TARGET_CC) -C $(OPENSSH_DIR)
@@ -73,6 +74,7 @@ openssh-source: $(DL_DIR)/$(OPENSSH_SOURCE)
openssh-clean:
$(MAKE) -C $(OPENSSH_DIR) clean
+ $(MAKE) CC=$(TARGET_CC) DESTDIR=$(TARGET_DIR) -C $(OPENSSH_DIR) uninstall
openssh-dirclean:
rm -rf $(OPENSSH_DIR)