From 91293e02d2cf227a8cbeb4f4bc5aaed5cc86bac4 Mon Sep 17 00:00:00 2001
From: Nathan Binkert <binkertn@umich.edu>
Date: Sun, 26 Oct 2003 22:40:03 -0500
Subject: Make the tap work work again

util/tap/Makefile:
    Make this stuff compile again
util/tap/tap.cc:
    clean up some of the error messages

--HG--
extra : convert_revision : 4543d946b48c9e07bf19b812db6466f80ed6b851
---
 util/tap/Makefile | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'util/tap/Makefile')

diff --git a/util/tap/Makefile b/util/tap/Makefile
index c7078158b..2618a5210 100644
--- a/util/tap/Makefile
+++ b/util/tap/Makefile
@@ -33,14 +33,12 @@ CXX= g++
 
 CURDIR?= $(shell /bin/pwd)
 SRCDIR?= .
+M5_SRCDIR?= $(SRCDIR)/../..
 
-BASE_SRCDIR?= $(SRCDIR)/../../base
-SIM_SRCDIR?= $(SRCDIR)/../../sim
+vpath % $(M5_SRCDIR)/base
+vpath % $(M5_SRCDIR)/sim
 
-vpath % $(BASE_SRCDIR)
-vpath % $(SIM_SRCDIR)
-
-INCLDIRS= -I. -I$(BASE_SRCDIR) -I$(SIM_SRCDIR) -I- -I/usr/local/include
+INCLDIRS= -I. -I$(M5_SRCDIR) -I- -I/usr/local/include
 CCFLAGS= -g -O0 -MMD $(INCLDIRS) 
 
 default: m5tap
@@ -48,6 +46,8 @@ default: m5tap
 m5tap: tap.o cprintf.o
 	$(CXX) $(LFLAGS) -o $@ $^ -lpcap -L/usr/local/lib -ldnet 
 
+install: m5tap
+	$(SUDO) install -o root -m 555 m5tap /usr/local/bin
 
 clean:
 	@rm -f m5tap *.o *.d *~ .#*
-- 
cgit v1.2.3