From b6d4df99dd07d3d7f1940f34ffa6909805ae50c8 Mon Sep 17 00:00:00 2001
From: Aggelos Economopoulos <aoiko@cc.ece.ntua.gr>
Date: Fri, 23 Apr 2010 17:22:18 +0300
Subject: [PATCH] evtr: hook into the x86_64 build

Submitted-by: swildner@
---
 lib/Makefile     | 6 +-----
 usr.bin/Makefile | 4 ++--
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/lib/Makefile b/lib/Makefile
index 322e0023ce..9de7f5c35f 100644
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -30,11 +30,7 @@ SUBDIR=	csu \
 	libpcap libposix1e libsdp libthread_xu libpthread librpcsvc ${_libsm} \
 	${_libsmb} ${_libsmdb} ${_libsmutil} libstand libtelnet libusbhid \
 	${_libvgl} libwrap libxpg4 liby libypclnt libz i18n_module pam_module \
-	libc_rtld libsctp
-
-.if ${MACHINE_ARCH} == "i386"
-SUBDIR+= libevtr
-.endif
+	libc_rtld libsctp libevtr
 
 .if exists(${.CURDIR}/compat/${MACHINE_ARCH}/Makefile)
 SUBDIR+= compat/${MACHINE_ARCH}
diff --git a/usr.bin/Makefile b/usr.bin/Makefile
index c6be0dbd83..a5fc18c7ec 100644
--- a/usr.bin/Makefile
+++ b/usr.bin/Makefile
@@ -50,6 +50,7 @@ SUBDIR=	alias \
 	ee \
 	enigma \
 	env \
+	evtranalyze \
 	expand \
 	false \
 	fetch \
@@ -85,6 +86,7 @@ SUBDIR=	alias \
 	keylogout \
 	killall \
 	ktrace \
+	ktrdump \
 	kzip \
 	lam \
 	last \
@@ -256,10 +258,8 @@ SUBDIR+=vacation
 .if ${MACHINE_ARCH} == "i386"
 # Things that don't compile on x86_64 or are i386 specific:
 SUBDIR+=doscmd \
-	evtranalyze \
 	gcore \
 	gprof4 \
-	ktrdump \
 	ncplist \
 	ncplogin \
 	sasc \
-- 
2.41.0