diff --git a/Makefile b/Makefile
index cac7163..119cf94 100644
--- a/Makefile
+++ b/Makefile
@@ -9,6 +9,8 @@ all: build EvalHaskell.h
 
 build::
 	cd src && $(MAKE)
+	@find src -name depend -exec rm {} \;
+	cd src && $(MAKE) way=p
 
 EvalHaskell.h: build
 	cp src/eval/Eval/Haskell_stub.h $@
@@ -21,7 +23,7 @@ EvalHaskell.h: build
 install:
 	$(INSTALL_DATA_DIR) $(LIBDIR)/include
 	$(INSTALL_DATA) EvalHaskell.h $(LIBDIR)/include
-	@(cd src && $(MAKE) install)
+	@(cd src && $(MAKE) install && $(MAKE) install way=p)
 
 #
 # and register the library with ghc package system
diff --git a/src/eval/Makefile b/src/eval/Makefile
index 3957a23..46de68e 100644
--- a/src/eval/Makefile
+++ b/src/eval/Makefile
@@ -3,7 +3,7 @@ UPKG	= Eval
 
 ALL_SRCS=$(wildcard $(patsubst ./%, %, $(patsubst %, %/*.hs, . $(UPKG))))
 
-STUBOBJS   =Eval/Haskell_stub.o
+STUBOBJS   =Eval/Haskell_stub.$(way_)o
 
 TOP=../..
 include ../build.mk