diff options
| author | Florian Obser <florian@cvs.openbsd.org> | 2014-04-26 11:02:46 +0000 |
|---|---|---|
| committer | Florian Obser <florian@cvs.openbsd.org> | 2014-04-26 11:02:46 +0000 |
| commit | fd5dbe61a90797b3a13ecfc05977fb25ead0a331 (patch) | |
| tree | c19392399d1c28e6ed25a9c5f3d2e8836adfaf22 /usr.sbin | |
| parent | 8914c8b8a3134df2114c7d7aa50ee947ab320196 (diff) | |
Link traceroute6 to traceroute, thus completing the merge.
I was originally sent on this little errand by deraadt@.
OK sthen@, benno@
(Committing from a bus somewhere in germany on its way to berlin.)
Diffstat (limited to 'usr.sbin')
| -rw-r--r-- | usr.sbin/Makefile | 4 | ||||
| -rw-r--r-- | usr.sbin/traceroute/Makefile | 4 |
2 files changed, 5 insertions, 3 deletions
diff --git a/usr.sbin/Makefile b/usr.sbin/Makefile index db5cc6df386..0ffc155093a 100644 --- a/usr.sbin/Makefile +++ b/usr.sbin/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.176 2014/04/24 14:55:39 tedu Exp $ +# $OpenBSD: Makefile,v 1.177 2014/04/26 11:02:45 florian Exp $ .include <bsd.own.mk> @@ -16,7 +16,7 @@ SUBDIR= ac accton acpidump adduser amd apm apmd arp \ ripctl ripd rmt route6d rpc.bootparamd rpc.lockd rpc.statd rtadvd \ rtsold sa sasyncd sensorsd sliplogin slowcgi slstats smtpd \ snmpctl snmpd spamdb syslogc syslogd sysmerge tcpdrop tcpdump \ - tftp-proxy tftpd tokenadm tokeninit traceroute traceroute6 trpt \ + tftp-proxy tftpd tokenadm tokeninit traceroute trpt \ unbound usbdevs user vipw watchdogd wsconscfg wsfontload wsmoused \ zdump zic ztsscale diff --git a/usr.sbin/traceroute/Makefile b/usr.sbin/traceroute/Makefile index 4ea6d8067d5..2398ba34e88 100644 --- a/usr.sbin/traceroute/Makefile +++ b/usr.sbin/traceroute/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.7 2014/04/25 12:10:45 florian Exp $ +# $OpenBSD: Makefile,v 1.8 2014/04/26 11:02:45 florian Exp $ PROG= traceroute @@ -9,6 +9,8 @@ CFLAGS+= -Wshadow -Wpointer-arith -Wcast-qual MAN= traceroute.8 MLINKS= traceroute.8 traceroute6.8 + +LINKS= ${BINDIR}/traceroute ${BINDIR}/traceroute6 BINOWN= root BINMODE=4555 |