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.)

diff --git a/usr.bin/bgplg/Makefile b/usr.bin/bgplg/Makefile
index 5e52a77..a573017 100644 (file)
--- a/usr.bin/bgplg/Makefile
+++ b/usr.bin/bgplg/Makefile
@@ -1,8 +1,8 @@
-#      $OpenBSD: Makefile,v 1.2 2010/04/02 21:20:49 sthen Exp $
+#      $OpenBSD: Makefile,v 1.3 2014/04/26 11:02:45 florian Exp $
 
 .include <bsd.own.mk>
 
-SUBDIR=                bgplg bgplgsh bgpctl ping traceroute ping6 traceroute6
+SUBDIR=                bgplg bgplgsh bgpctl ping traceroute ping6
 
 INCFILES=      bgplg.head \
                bgplg.foot \

diff --git a/usr.bin/bgplg/traceroute/Makefile b/usr.bin/bgplg/traceroute/Makefile
index 8942afb..adcfb22 100644 (file)
--- a/usr.bin/bgplg/traceroute/Makefile
+++ b/usr.bin/bgplg/traceroute/Makefile
@@ -1,4 +1,4 @@
-#      $OpenBSD: Makefile,v 1.1 2006/12/11 23:10:11 reyk Exp $
+#      $OpenBSD: Makefile,v 1.2 2014/04/26 11:02:45 florian Exp $
 
 PROGDIR=       ${.CURDIR}/../../../usr.sbin/traceroute
 
@@ -6,9 +6,11 @@ LDSTATIC=      -static
 CFLAGS+=       -I${PROGDIR}
 NOMAN=         yes
 
+BINDIR=                /var/www/bin
+LINKS=         ${BINDIR}/traceroute ${BINDIR}/traceroute6
+
 .include "${PROGDIR}/Makefile"
 
-BINDIR=                /var/www/bin
 BINMODE=       000
 
 .PATH:         ${PROGDIR}

diff --git a/usr.sbin/Makefile b/usr.sbin/Makefile
index db5cc6d..0ffc155 100644 (file)
--- 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 4ea6d80..2398ba3 100644 (file)
--- 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