diff --git a/Makefile.in b/Makefile.in
index 7753a0aad..e77c8c1b7 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -16,7 +16,7 @@
 #    59 Temple Place - Suite 330
 #    Boston, MA 02111-1307, USA
 #
-#ident "$Id: Makefile.in,v 1.88 2000/12/09 01:17:38 steve Exp $"
+#ident "$Id: Makefile.in,v 1.89 2001/01/09 03:11:27 steve Exp $"
 #
 #
 SHELL = /bin/sh
@@ -45,7 +45,7 @@ INSTALL_DATA = @INSTALL_DATA@
 STRIP = @STRIP@
 
 CPPFLAGS = @CPPFLAGS@ @DEFS@
-CXXFLAGS = @CXXFLAGS@ -I$(srcdir)
+CXXFLAGS = @CXXFLAGS@ -I. -I$(srcdir)
 LDFLAGS = @LDFLAGS@
 
 # The TARGETS variable lists the target modules that can be build and
@@ -150,7 +150,7 @@ lexor.cc: $(srcdir)/lexor.lex
 lexor_keyword.o: lexor_keyword.cc
 
 lexor_keyword.cc: lexor_keyword.gperf
-	gperf -o -i 7 -C -k 1-3,$$ -L ANSI-C -H keyword_hash -N check_identifier -t lexor_keyword.gperf > lexor_keyword.cc || (rm -f lexor_keyword.cc ; false)
+	gperf -o -i 7 -C -k 1-3,$$ -L ANSI-C -H keyword_hash -N check_identifier -t $(srcdir)/lexor_keyword.gperf > lexor_keyword.cc || (rm -f lexor_keyword.cc ; false)
 
 
 install: all installdirs $(libdir)/ivl/ivl@EXEEXT@ $(libdir)/ivl/iverilog.conf $(includedir)/ivl_target.h
diff --git a/driver/Makefile.in b/driver/Makefile.in
index f9e9b424e..dd0f9628c 100644
--- a/driver/Makefile.in
+++ b/driver/Makefile.in
@@ -18,7 +18,7 @@
 #    59 Temple Place - Suite 330
 #    Boston, MA 02111-1307, USA
 #
-#ident "$Id: Makefile.in,v 1.2 2000/11/09 21:58:00 steve Exp $"
+#ident "$Id: Makefile.in,v 1.3 2001/01/09 03:11:27 steve Exp $"
 #
 #
 SHELL = /bin/sh
@@ -46,7 +46,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_DATA = @INSTALL_DATA@
 
 CPPFLAGS = @CPPFLAGS@ @DEFS@
-CFLAGS = @CFLAGS@
+CFLAGS = @CFLAGS@ -I.
 LDFLAGS = @LDFLAGS@
 
 all: iverilog@EXEEXT@
@@ -60,14 +60,14 @@ iverilog@EXEEXT@: $O
 	$(CC) $(LDFLAGS) $O -o iverilog@EXEEXT@
 
 lexor.c: lexor.lex
-	flex -s -olexor.c lexor.lex
+	flex -s -olexor.c $(srcdir)/lexor.lex
 
 parse.h parse.c: parse.y
-	bison --verbose -t -d parse.y -o parse.c
+	bison --verbose -t -d $(srcdir)/parse.y -o parse.c
 
 
 main.o: main.c globals.h
-	$(CC) $(CPPFLAGS) -c -DCXX='"@CXX@"' -DIVL_ROOT='"@libdir@/ivl"'  -DIVL_INC='"@includedir@"' -DIVL_LIB='"@libdir@"' -DRDYNAMIC=\"$(rdynamic)\" -DDLLIB='"@DLLIB@"' main.c
+	$(CC) $(CPPFLAGS) -c -DCXX='"@CXX@"' -DIVL_ROOT='"@libdir@/ivl"'  -DIVL_INC='"@includedir@"' -DIVL_LIB='"@libdir@"' -DRDYNAMIC=\"$(rdynamic)\" -DDLLIB='"@DLLIB@"' $(srcdir)/main.c
 
 build_string.o: build_string.c globals.h
 lexor.o: lexor.c parse.h globals.h
diff --git a/ivlpp/Makefile.in b/ivlpp/Makefile.in
index 1d09fd55b..e81c9b8e9 100644
--- a/ivlpp/Makefile.in
+++ b/ivlpp/Makefile.in
@@ -18,7 +18,7 @@
 #    59 Temple Place - Suite 330
 #    Boston, MA 02111-1307, USA
 #
-#ident "$Id: Makefile.in,v 1.8 2000/11/11 00:49:40 steve Exp $"
+#ident "$Id: Makefile.in,v 1.9 2001/01/09 03:11:28 steve Exp $"
 #
 #
 SHELL = /bin/sh
@@ -41,7 +41,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_DATA = @INSTALL_DATA@
 
 CPPFLAGS = @CPPFLAGS@ @DEFS@
-CFLAGS = @CFLAGS@
+CFLAGS = @CFLAGS@ -I.
 LDFLAGS = @LDFLAGS@
 
 all: ivlpp
@@ -55,10 +55,10 @@ ivlpp: $O
 	$(CC) $(LDFLAGS) $O -o ivlpp
 
 lexor.c: lexor.lex
-	flex -s -olexor.c lexor.lex
+	flex -s -olexor.c $(srcdir)/lexor.lex
 
 parse.h parse.c: parse.y
-	bison --verbose -t -d parse.y -o parse.c
+	bison --verbose -t -d $(srcdir)/parse.y -o parse.c
 
 install: all installdirs $(libdir)/ivl/ivlpp
 
diff --git a/vpi/Makefile.in b/vpi/Makefile.in
index bc126ac0d..c76ef6705 100644
--- a/vpi/Makefile.in
+++ b/vpi/Makefile.in
@@ -18,7 +18,7 @@
 #    59 Temple Place - Suite 330
 #    Boston, MA 02111-1307, USA
 #
-#ident "$Id: Makefile.in,v 1.19 2000/11/11 00:53:36 steve Exp $"
+#ident "$Id: Makefile.in,v 1.20 2001/01/09 03:11:28 steve Exp $"
 #
 #
 SHELL = /bin/sh
@@ -42,7 +42,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_DATA = @INSTALL_DATA@
 
 CPPFLAGS = @CPPFLAGS@ @DEFS@ @PICFLAG@
-CXXFLAGS = @CXXFLAGS@
+CFLAGS = @CFLAGS@
 LDFLAGS = @LDFLAGS@
 STRIP = @STRIP@
 
@@ -50,7 +50,7 @@ all: system.vpi
 
 %.o: %.c
 	@[ -d dep ] || mkdir dep
-	$(CC) -Wall $(CPPFLAGS) -I$(srcdir) -MD -c $< -o $*.o
+	$(CC) -Wall $(CPPFLAGS) $(CFLAGS) -I$(srcdir) -MD -c $< -o $*.o
 	mv $*.d dep
 
 O = sys_table.o sys_display.o sys_finish.o sys_random.o \
@@ -68,7 +68,7 @@ system.vpi: $O $(VPI_DEPLIBS)
 	$(CC) -shared -o $@ $O $(SYSTEM_VPI_LDFLAGS)
 
 sys_readmem_lex.c: sys_readmem_lex.lex
-	flex -t -Preadmem sys_readmem_lex.lex > sys_readmem_lex.c
+	flex -t -Preadmem $(srcdir)/sys_readmem_lex.lex > sys_readmem_lex.c
 
 clean:
 	rm -f *.o dep/*.d