diff --git a/lang/m2/libm2/proto.make b/lang/m2/libm2/proto.make
index 0ce3304c0..06cce1e88 100644
--- a/lang/m2/libm2/proto.make
+++ b/lang/m2/libm2/proto.make
@@ -2,8 +2,8 @@
 
 #PARAMS		do not remove this line!
 
-DEFDIR = $(TARGET_HOME)/lib/m2
-SRCDIR = $(SRC_HOME)/lang/m2/libm2
+DEF_DIR = $(TARGET_HOME)/lib/m2
+SRC_DIR = $(SRC_HOME)/lang/m2/libm2
 
 SOURCES =	ASCII.def EM.def MathLib0.def Processes.def \
 		RealInOut.def Storage.def Arguments.def Conversion.def \
@@ -25,5 +25,5 @@ opr:
 		make pr | opr
 
 install:
-		-mkdir $(DEFDIR)
-		for i in $(SOURCES) ; do cp $(SRC_DIR)/$$i $(DEFDIR)/$$i ; done
+		-mkdir $(DEF_DIR)
+		for i in $(SOURCES) ; do cp $(SRC_DIR)/$$i $(DEF_DIR)/$$i ; done
diff --git a/mach/proto/as/proto.make b/mach/proto/as/proto.make
index 3437e48b2..9fd3e7cf5 100644
--- a/mach/proto/as/proto.make
+++ b/mach/proto/as/proto.make
@@ -29,6 +29,7 @@ COMM	= $(CDIR)/comm0.h $(CDIR)/comm1.h $(CDIR)/comm2.y $(CSRC)
 all:	as
 
 install:all
+	-mkdir $(TARGET_HOME)/lib.bin/$(MACH)
 	cp as $(TARGET_HOME)/lib.bin/$(MACH)/as
 
 cmp:
@@ -57,12 +58,12 @@ as.c:	as.y
 
 y.tab.h:	as.c
 $(COBJ):	y.tab.h
-$(COBJ) as.y:	$(CDIR)/comm0.h mach0.c
-$(COBJ) as.y:	$(CDIR)/comm1.h mach1.c
-as.y:		mach2.c
-comm3.$(SUF):	mach3.c
-as.y:		mach4.c
-comm8.$(SUF):	mach5.c
+$(COBJ) as.y:	$(CDIR)/comm0.h $(MDIR)/mach0.c
+$(COBJ) as.y:	$(CDIR)/comm1.h $(MDIR)/mach1.c
+as.y:		$(MDIR)/mach2.c
+comm3.$(SUF):	$(MDIR)/mach3.c
+as.y:		$(MDIR)/mach4.c
+comm8.$(SUF):	$(MDIR)/mach5.c
 comm3.$(SUF):	$(CDIR)/comm3.c
 		$(CC) -c $(CFLAGS) $(CDIR)/comm3.c
 comm4.$(SUF):	$(CDIR)/comm4.c
diff --git a/mach/proto/cg/proto.make b/mach/proto/cg/proto.make
index 947a511aa..6df95a124 100644
--- a/mach/proto/cg/proto.make
+++ b/mach/proto/cg/proto.make
@@ -68,6 +68,7 @@ var.$(SUF): $(CDIR)/var.c
 	$(CC) -c $(CFLAGS) $(CDIR)/var.c
 
 install: all
+	-mkdir $(TARGET_HOME)/lib.bin/$(MACH)
 	cp cg $(TARGET_HOME)/lib.bin/$(MACH)/cg
 
 cmp:	 all
diff --git a/mach/proto/ncg/proto.make b/mach/proto/ncg/proto.make
index 298dc2a53..47087a084 100644
--- a/mach/proto/ncg/proto.make
+++ b/mach/proto/ncg/proto.make
@@ -78,6 +78,7 @@ var.$(SUF): $(CDIR)/var.c
 	$(CC) -c $(CFLAGS) $(CDIR)/var.c
 
 install: all
+	mkdir $(TARGET_HOME)/lib.bin/$(MACH)
 	cp cg $(TARGET_HOME)/lib.bin/$(MACH)/cg
 
 cmp:	 all
diff --git a/mach/proto/top/proto.make b/mach/proto/top/proto.make
index c50cc47f0..060f87f87 100644
--- a/mach/proto/top/proto.make
+++ b/mach/proto/top/proto.make
@@ -29,6 +29,7 @@ queue.$(SUF): $(CDIR)/queue.c
 	$(CC) -c $(CFLAGS) $(CDIR)/queue.c
 
 install: all
+	-mkdir $(TARGET_HOME)/lib.bin/$(MACH)
 	cp top $(TARGET_HOME)/lib.bin/$(MACH)/top
 
 cmp:	 all
diff --git a/util/ceg/EM_parser/common/proto.make b/util/ceg/EM_parser/common/proto.make
index f24ba4b9a..9e0c085e0 100644
--- a/util/ceg/EM_parser/common/proto.make
+++ b/util/ceg/EM_parser/common/proto.make
@@ -2,6 +2,7 @@
 
 #PARAMS		do not remove this line!
 
+SRC_DIR = $(SRC_HOME)/util/ceg/EM_parser/common
 CEGLIB = $(TARGET_HOME)/lib.bin/ceg
 PARLIB = $(CEGLIB)/EM_parser
 OBJLIB = $(PARLIB)/obj_EM_pars
@@ -11,7 +12,7 @@ GFILES = $(SRC_DIR)/pars.g
 OFILES = pars.$(SUF) Lpars.$(SUF) scan.$(SUF) mylex.$(SUF) default.$(SUF) \
 	 C_instr2.$(SUF) help.$(SUF) eval.$(SUF) action.$(SUF)
 
-IFILES = -I$(TARGET_HOME)/h -I$(TARGET_HOME)/modules/h -I.
+IFILES = -I$(TARGET_HOME)/h -I$(TARGET_HOME)/modules/h -I. -I$(SRC_DIR)
 CFLAGS = $(COPTIONS) $(IFILES)
 
 all :	dummy