diff -ur merd.orig/Makefile merd/Makefile
--- merd.orig/Makefile	Fri Jun 14 07:29:27 2002
+++ merd/Makefile	Mon Jun 17 12:46:29 2002
@@ -5,15 +5,15 @@
 .PHONY: tar clean all
 
 all:
-	make -C docs all
-	make -C proto all
+	$(MAKE) -C docs all
+	$(MAKE) -C proto all
 
 clean:
 	rm -f *~ *.sav merd-*.tar.bz2 merd_*.{dsc,deb,changes,tar.gz} merd-*.rpm
 	rm -f `find -name "*.mec"`
-	make -C lib clean
-	make -C docs clean
-	make -C proto clean
+	$(MAKE) -C lib clean
+	$(MAKE) -C docs clean
+	$(MAKE) -C proto clean
 
 install: all
 	install -d $(datadir)/merd
diff -ur merd.orig/proto/Makefile merd/proto/Makefile
--- merd.orig/proto/Makefile	Fri Jun 14 07:29:37 2002
+++ merd/proto/Makefile	Mon Jun 17 12:45:17 2002
@@ -15,7 +15,7 @@
 
 ALL_PROGS = merd_debug merd
 
-PROG_OBJS_WITH_CMI = lattice.cmo info.cmo print.cmo rew.cmo parser.cmo grouper.cmo rewrite.cmo env.cmo type_handling.cmo interpreter.cmo type_inference.cmo package.cmo merd.cmo
+PROG_OBJS_WITH_CMI = lattice.cmo info.cmo print.cmo rew.cmo parser.cmo grouper.cmo rewrite.cmo env.cmo type_handling.cmo interpreter.cmo type_inference.cmo lexer.cmo package.cmo merd.cmo
 PROG_OBJS = common.cmo flags.cmo $(LEX_FILES:%.mll=%.cmo) $(PROG_OBJS_WITH_CMI)
 CMA_FILES = unix.cma
 
@@ -84,5 +84,6 @@
 # missing dependencies:
 package.cmo: lexer.cmi
 lexer.cmo: common.cmi
+lexer.cmi: lexer.mll
 
 -include .depend