summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Olbrich <m.olbrich@pengutronix.de>2017-01-09 14:52:08 +0100
committerMichael Olbrich <m.olbrich@pengutronix.de>2017-04-11 11:18:22 +0200
commitd8b15dabfffc09b11a5cc0c54717d623019a5ffa (patch)
tree9a451a2fa241c08d79a0282f93e787f590858104
parent611e5b3695bb15d92e849e51f743cbb92ace1e31 (diff)
downloadptxdist-d8b15dabfffc09b11a5cc0c54717d623019a5ffa.tar.gz
ptxdist-d8b15dabfffc09b11a5cc0c54717d623019a5ffa.tar.xz
lsh: /usr merge
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
-rw-r--r--rules/lsh.make14
1 files changed, 7 insertions, 7 deletions
diff --git a/rules/lsh.make b/rules/lsh.make
index 42d68ce23..c20071a98 100644
--- a/rules/lsh.make
+++ b/rules/lsh.make
@@ -36,7 +36,7 @@ LSH_ENV := $(CROSS_ENV)
# autoconf
#
LSH_AUTOCONF := \
- $(CROSS_AUTOCONF_ROOT) \
+ $(CROSS_AUTOCONF_USR) \
$(GLOBAL_IPV6_OPTION) \
--sysconfdir=/etc/lsh \
--includedir=/usr/include/lsh \
@@ -67,27 +67,27 @@ $(STATEDIR)/lsh.targetinstall:
@$(call install_fixup, lsh,DESCRIPTION,missing)
ifdef PTXCONF_LSH_EXECUV
- @$(call install_copy, lsh, 0, 0, 0755, -, /sbin/lsh-execuv)
+ @$(call install_copy, lsh, 0, 0, 0755, -, /usr/sbin/lsh-execuv)
endif
ifdef PTXCONF_LSH_LSHD
- @$(call install_copy, lsh, 0, 0, 0755, -, /sbin/lshd)
+ @$(call install_copy, lsh, 0, 0, 0755, -, /usr/sbin/lshd)
endif
ifdef PTXCONF_LSH_SFTPD
- @$(call install_copy, lsh, 0, 0, 0755, -, /sbin/sftp-server)
+ @$(call install_copy, lsh, 0, 0, 0755, -, /usr/sbin/sftp-server)
endif
ifdef PTXCONF_LSH_MAKESEED
- @$(call install_copy, lsh, 0, 0, 0755, -, /bin/lsh-make-seed)
+ @$(call install_copy, lsh, 0, 0, 0755, -, /usr/bin/lsh-make-seed)
endif
ifdef PTXCONF_LSH_WRITEKEY
- @$(call install_copy, lsh, 0, 0, 0755, -, /bin/lsh-writekey)
+ @$(call install_copy, lsh, 0, 0, 0755, -, /usr/bin/lsh-writekey)
endif
ifdef PTXCONF_LSH_KEYGEN
- @$(call install_copy, lsh, 0, 0, 0755, -, /bin/lsh-keygen)
+ @$(call install_copy, lsh, 0, 0, 0755, -, /usr/bin/lsh-keygen)
endif
@$(call install_finish, lsh)
@$(call touch)