$OpenBSD$
--- tests/Makefile.orig	Mon Nov  4 23:36:30 2002
+++ tests/Makefile	Mon Nov  4 23:41:10 2002
@@ -4,12 +4,12 @@ include ../Makefile.inc
 # Override these variables, as well as CYCFLAGS, to test different
 #   compilers/libraries (probably because you are bootstrapping the compiler) 
 # (see targets test, test_bin, and test_src in parent directory's Makefile)
-CYCBISON=cycbison$(EXE)
+CYCBISON=${LOCALBASE}/bin/cyclone/cycbison$(EXE)
 ifndef devel
-CYCC=cyclone$(EXE)
+CYCC=${LOCALBASE}/bin/cyclone/cyclone$(EXE)
 else
 CYCC=../build/boot/cyclone$(EXE)
-CYCFLAGS=-I../lib -I../include -B../build/boot -pp -save-c
+CYCFLAGS=-I../lib -I../include -I${LOCALBASE}/include/cyclone -B../build/boot -pp -save-c
 endif
 
 all: $(addsuffix $(EXE), cyctest foo hello test_regions histogram test_getopt)
@@ -32,7 +32,7 @@ foo$(EXE): foo_tab.o foo.o
 	$(CYCC) $(CYCFLAGS) -o $@ $^ $(LDFLAGS)
 
 foo_tab.o : foo_tab.cyc
-	$(CYCC) $(CYCFLAGS) -c $<
+	$(CYCC) -I${LOCALBASE}/include/cyclone $(CYCFLAGS) -c $<
 
 foo_tab.cyc : foo.y
 	$(CYCBISON) -v -d $< -o $@
@@ -69,7 +69,7 @@ genrep_test$(EXE):  genrep_test.o muttre
 
 # This takes care of non-machine-generated versions (the .cyc is already there)
 %.o : %.cyc
-	$(CYCC) $(CYCFLAGS) -c $< 
+	$(CYCC) -I${LOCALBASE}/include/cyclone $(CYCFLAGS) -c $< 
 
 #This takes care of any single-file program
 %$(EXE): %.cyc