diff options
author | Michael Olbrich <m.olbrich@pengutronix.de> | 2017-04-07 09:24:19 +0200 |
---|---|---|
committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2017-04-11 11:22:04 +0200 |
commit | 8a636c1cb0323b144f0cd14371e04b205ec759a3 (patch) | |
tree | 8494520e78bbf50a582c841d7bd8ffe0bdcc4d34 /rules/inetutils.make | |
parent | cf389a5c39af22ba0201272eb2d721e855202969 (diff) | |
download | ptxdist-8a636c1cb0323b144f0cd14371e04b205ec759a3.tar.gz ptxdist-8a636c1cb0323b144f0cd14371e04b205ec759a3.tar.xz |
inetutils: /usr merge
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
Diffstat (limited to 'rules/inetutils.make')
-rw-r--r-- | rules/inetutils.make | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/rules/inetutils.make b/rules/inetutils.make index 5841799e8..fcbfd80ee 100644 --- a/rules/inetutils.make +++ b/rules/inetutils.make @@ -102,12 +102,10 @@ ifdef PTXCONF_INETUTILS_INETD @$(call install_copy, inetutils, 0, 0, 0755, -, /usr/sbin/inetd) endif ifdef PTXCONF_INETUTILS_PING - @$(call install_copy, inetutils, 0, 0, 4755, \ - $(INETUTILS_PKGDIR)/usr/bin/ping, /bin/ping) + @$(call install_copy, inetutils, 0, 0, 4755, -, /usr/bin/ping) endif ifdef PTXCONF_INETUTILS_PING6 - @$(call install_copy, inetutils, 0, 0, 4755, \ - $(INETUTILS_PKGDIR)/usr/bin/ping6, /bin/ping6) + @$(call install_copy, inetutils, 0, 0, 4755, -, /usr/bin/ping6) endif ifdef PTXCONF_INETUTILS_RCP @$(call install_copy, inetutils, 0, 0, 0755, -, /usr/bin/rcp) @@ -124,8 +122,7 @@ ifdef PTXCONF_INETUTILS_RSHD /etc/inetd.conf.d/inetutils-rshd, n) endif ifdef PTXCONF_INETUTILS_SYSLOGD - @$(call install_copy, inetutils, 0, 0, 0755, \ - $(INETUTILS_PKGDIR)/usr/sbin/syslogd, /sbin/syslogd) + @$(call install_copy, inetutils, 0, 0, 0755, -, /usr/sbin/syslogd) endif ifdef PTXCONF_INETUTILS_SYSLOGD_STARTSCRIPT @$(call install_alternative, inetutils, 0, 0, 0755, \ @@ -142,8 +139,7 @@ ifdef PTXCONF_INETUTILS_SYSLOGD_CONFIG /etc/syslog.conf, n) endif ifdef PTXCONF_INETUTILS_TFTPD - @$(call install_copy, inetutils, 0, 0, 0755, \ - $(INETUTILS_PKGDIR)/usr/sbin/tftpd, /sbin/tftpd) + @$(call install_copy, inetutils, 0, 0, 0755, -, /usr/sbin/tftpd) ifneq ($(PTXCONF_INETUTILS_TFTPD_BASE_DIR),"") # # create the base dir @$(call install_copy, inetutils, 99, 0, 0755, \ |