119c119
< make-hs-obj     =$(call run-with-echo,$(HC) -c $(2) -o $(1) -ohi $(basename $(1)).hi -odir $(dir $(1)) $(3))
---
> make-hs-obj     =$(call run-with-echo,$(HC) -c $(2) -o $(1) $(3))
120a121,124
> # the new ghc (6.4) produces recursice dep files in the sprit if --make
> # We use grep to get rid of it
> #  If we add -odir outputdir and -hidir outputdir to the ghc -M call we get proper dirs for the .o and .hi entries 
> #  Therefore we only have to replace .hi with .o
123,124c127,131
< 		 sed -e 's|$(basename $(2))|$(basename $(1))|' -e 's|\.hi|\.o|g' $(basename $(1)).d.in > $(basename $(1)).d && \
< 		 $(call silent-remove-file,$(basename $(1)).d.in)
---
> 		 grep "$(notdir $(1))" $(basename $(1)).d.in | \
> 		 sed -e 's|\.hi|\.o|g' > $(basename $(1)).d && \
>  		 $(call silent-remove-file,$(basename $(1)).d.in)
> # old
> #  		 sed -e 's|$(basename $(2))|$(basename $(1))|' -e 's|\.hi|\.o|g' > $(basename $(1)).d  &&