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.bin/bgplg | |
| 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.bin/bgplg')
| -rw-r--r-- | usr.bin/bgplg/Makefile | 4 | ||||
| -rw-r--r-- | usr.bin/bgplg/traceroute/Makefile | 6 |
2 files changed, 6 insertions, 4 deletions
diff --git a/usr.bin/bgplg/Makefile b/usr.bin/bgplg/Makefile index 5e52a775303..a5730176df5 100644 --- 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 8942afbac39..adcfb228d1d 100644 --- 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} |