diff --git a/mach/em22/libcc/Makefile b/mach/em22/libcc/Makefile
index 8c5babec..4f231a86 100644
--- a/mach/em22/libcc/Makefile
+++ b/mach/em22/libcc/Makefile
@@ -1,12 +1,13 @@
+SUF=m
 MAKEFILE=../../proto/libg/Makefile
-MACHDEF="MACH=int" "SUF=m"
+MACHDEF="MACH=int" "SUF=$(SUF)"
 STDIO="PREF=cc" "SUB=.1s" "SRC=lang/cem/libcc/stdio"
 GEN="PREF=cc" "SUB=.2g" "SRC=lang/cem/libcc/gen"
 MON="PREF=mon" "SRC=lang/cem/libcc/mon"
 LIBM="PREF=m" "SRC=lang/cem/libcc/libm"
 LIBLN="PREF=ln" "SRC=lang/cem/libcc/libln"
 
-install:	cpstdio cpgen cpmon cplibm cplibln
+install:	cpstdio cpgen cpmon
 
 cpstdio:
 		make -f $(MAKEFILE) $(STDIO) $(MACHDEF) tailcp
@@ -19,7 +20,7 @@ cplibm:
 cplibln:
 		make -f $(MAKEFILE) $(LIBLN) $(MACHDEF) tailcp
 
-cmp:		cmpstdio cmpgen cmpmon cmplibm cmplibln
+cmp:		cmpstdio cmpgen cmpmon
 
 cmpstdio:
 		make -f $(MAKEFILE) $(STDIO) $(MACHDEF) tail
diff --git a/mach/em22/libcc/compmodule b/mach/em22/libcc/compmodule
index 330b4aef..1c3c2ecf 100755
--- a/mach/em22/libcc/compmodule
+++ b/mach/em22/libcc/compmodule
@@ -1,2 +1,4 @@
-${MACH?} -I../../../h ${MACHFL?} -LIB $1 1>&2
-echo `basename $1 $2`.m
+if ${MACH?} -I../../../h ${MACHFL?} -LIB $1 1>&2
+then echo `basename $1 $2`.m
+else exit 1
+fi
diff --git a/mach/em24/libbc/Makefile b/mach/em24/libbc/Makefile
index 49e3164d..3b9dc3aa 100644
--- a/mach/em24/libbc/Makefile
+++ b/mach/em24/libbc/Makefile
@@ -1,5 +1,6 @@
+SUF=m
 MAKEFILE=../../proto/libg/Makefile
-MACHDEF="MACH=int24" "SUF=m"
+MACHDEF="MACH=int22" "SUF=$(SUF)"
 BCDEF="PREF=bc" "SUB=" "SRC=lang/basic/lib"
 
 install:
diff --git a/mach/em24/libbc/compmodule b/mach/em24/libbc/compmodule
index 330b4aef..1c3c2ecf 100755
--- a/mach/em24/libbc/compmodule
+++ b/mach/em24/libbc/compmodule
@@ -1,2 +1,4 @@
-${MACH?} -I../../../h ${MACHFL?} -LIB $1 1>&2
-echo `basename $1 $2`.m
+if ${MACH?} -I../../../h ${MACHFL?} -LIB $1 1>&2
+then echo `basename $1 $2`.m
+else exit 1
+fi
diff --git a/mach/em24/libcc/Makefile b/mach/em24/libcc/Makefile
index 971906ef..4f231a86 100644
--- a/mach/em24/libcc/Makefile
+++ b/mach/em24/libcc/Makefile
@@ -1,12 +1,13 @@
+SUF=m
 MAKEFILE=../../proto/libg/Makefile
-MACHDEF="MACH=int24" "SUF=m"
+MACHDEF="MACH=int" "SUF=$(SUF)"
 STDIO="PREF=cc" "SUB=.1s" "SRC=lang/cem/libcc/stdio"
 GEN="PREF=cc" "SUB=.2g" "SRC=lang/cem/libcc/gen"
 MON="PREF=mon" "SRC=lang/cem/libcc/mon"
 LIBM="PREF=m" "SRC=lang/cem/libcc/libm"
 LIBLN="PREF=ln" "SRC=lang/cem/libcc/libln"
 
-install:	cpstdio cpgen cpmon cplibm cplibln
+install:	cpstdio cpgen cpmon
 
 cpstdio:
 		make -f $(MAKEFILE) $(STDIO) $(MACHDEF) tailcp
@@ -19,25 +20,25 @@ cplibm:
 cplibln:
 		make -f $(MAKEFILE) $(LIBLN) $(MACHDEF) tailcp
 
-cmp:		cmpstdio cmpgen cmpmon cmplibm cmplibln
+cmp:		cmpstdio cmpgen cmpmon
 
 cmpstdio:
 		make -f $(MAKEFILE) $(STDIO) $(MACHDEF) tail
-		-../../compare tail_cc.1s
+		-../../compare tail_cc.1s 
 cmpgen:
 		make -f $(MAKEFILE) $(GEN) $(MACHDEF) head
-		-../../compare head_cc
+		-../../compare head_cc 
 		make -f $(MAKEFILE) $(GEN) $(MACHDEF) tail
-		-../../compare tail_cc.2g
+		-../../compare tail_cc.2g 
 cmpmon:
 		make -f $(MAKEFILE) $(MON) $(MACHDEF) tail
-		-../../compare tail_mon
+		-../../compare tail_mon 
 cmplibm:
 		make -f $(MAKEFILE) $(LIBM) $(MACHDEF) tail
-		-../../compare tail_m
+		-../../compare tail_m 
 cmplibln:
 		make -f $(MAKEFILE) $(LIBLN) $(MACHDEF) tail
-		-../../compare tail_ln
+		-../../compare tail_ln 
 
 clean:
 		-rm -f *.old *.[ce$(SUF)] tail* head*
diff --git a/mach/em24/libcc/compmodule b/mach/em24/libcc/compmodule
index 330b4aef..1c3c2ecf 100755
--- a/mach/em24/libcc/compmodule
+++ b/mach/em24/libcc/compmodule
@@ -1,2 +1,4 @@
-${MACH?} -I../../../h ${MACHFL?} -LIB $1 1>&2
-echo `basename $1 $2`.m
+if ${MACH?} -I../../../h ${MACHFL?} -LIB $1 1>&2
+then echo `basename $1 $2`.m
+else exit 1
+fi
diff --git a/mach/em24/libpc/Makefile b/mach/em24/libpc/Makefile
index 79770926..9258cacd 100644
--- a/mach/em24/libpc/Makefile
+++ b/mach/em24/libpc/Makefile
@@ -1,5 +1,6 @@
+SUF=m
 MAKEFILE=../../proto/libg/Makefile
-MACHDEF="MACH=int24" "SUF=m"
+MACHDEF="MACH=int" "SUF=$(SUF)"
 PCDEF="PREF=pc" "SUB=" "SRC=lang/pc/libpc"
 
 install:
diff --git a/mach/em24/libpc/compmodule b/mach/em24/libpc/compmodule
index 330b4aef..1c3c2ecf 100755
--- a/mach/em24/libpc/compmodule
+++ b/mach/em24/libpc/compmodule
@@ -1,2 +1,4 @@
-${MACH?} -I../../../h ${MACHFL?} -LIB $1 1>&2
-echo `basename $1 $2`.m
+if ${MACH?} -I../../../h ${MACHFL?} -LIB $1 1>&2
+then echo `basename $1 $2`.m
+else exit 1
+fi
diff --git a/mach/em44/libbc/Makefile b/mach/em44/libbc/Makefile
index 4dc2b3ac..3b9dc3aa 100644
--- a/mach/em44/libbc/Makefile
+++ b/mach/em44/libbc/Makefile
@@ -1,5 +1,6 @@
+SUF=m
 MAKEFILE=../../proto/libg/Makefile
-MACHDEF="MACH=int44" "SUF=m"
+MACHDEF="MACH=int22" "SUF=$(SUF)"
 BCDEF="PREF=bc" "SUB=" "SRC=lang/basic/lib"
 
 install:
diff --git a/mach/em44/libbc/compmodule b/mach/em44/libbc/compmodule
index 330b4aef..1c3c2ecf 100755
--- a/mach/em44/libbc/compmodule
+++ b/mach/em44/libbc/compmodule
@@ -1,2 +1,4 @@
-${MACH?} -I../../../h ${MACHFL?} -LIB $1 1>&2
-echo `basename $1 $2`.m
+if ${MACH?} -I../../../h ${MACHFL?} -LIB $1 1>&2
+then echo `basename $1 $2`.m
+else exit 1
+fi
diff --git a/mach/em44/libcc/Makefile b/mach/em44/libcc/Makefile
index 9f0eb0f0..4f231a86 100644
--- a/mach/em44/libcc/Makefile
+++ b/mach/em44/libcc/Makefile
@@ -1,12 +1,13 @@
+SUF=m
 MAKEFILE=../../proto/libg/Makefile
-MACHDEF="MACH=int44" "SUF=m"
+MACHDEF="MACH=int" "SUF=$(SUF)"
 STDIO="PREF=cc" "SUB=.1s" "SRC=lang/cem/libcc/stdio"
 GEN="PREF=cc" "SUB=.2g" "SRC=lang/cem/libcc/gen"
 MON="PREF=mon" "SRC=lang/cem/libcc/mon"
 LIBM="PREF=m" "SRC=lang/cem/libcc/libm"
 LIBLN="PREF=ln" "SRC=lang/cem/libcc/libln"
 
-install:	cpstdio cpgen cpmon cplibm cplibln cpmon
+install:	cpstdio cpgen cpmon
 
 cpstdio:
 		make -f $(MAKEFILE) $(STDIO) $(MACHDEF) tailcp
@@ -19,25 +20,25 @@ cplibm:
 cplibln:
 		make -f $(MAKEFILE) $(LIBLN) $(MACHDEF) tailcp
 
-cmp:		cmpstdio cmpgen cmpmon cmplibm cmplibln
+cmp:		cmpstdio cmpgen cmpmon
 
 cmpstdio:
 		make -f $(MAKEFILE) $(STDIO) $(MACHDEF) tail
-		-../../compare tail_cc.1s
+		-../../compare tail_cc.1s 
 cmpgen:
 		make -f $(MAKEFILE) $(GEN) $(MACHDEF) head
-		-../../compare head_cc
+		-../../compare head_cc 
 		make -f $(MAKEFILE) $(GEN) $(MACHDEF) tail
-		-../../compare tail_cc.2g
+		-../../compare tail_cc.2g 
 cmpmon:
 		make -f $(MAKEFILE) $(MON) $(MACHDEF) tail
-		-../../compare tail_mon
+		-../../compare tail_mon 
 cmplibm:
 		make -f $(MAKEFILE) $(LIBM) $(MACHDEF) tail
-		-../../compare tail_m
+		-../../compare tail_m 
 cmplibln:
 		make -f $(MAKEFILE) $(LIBLN) $(MACHDEF) tail
-		-../../compare tail_ln
+		-../../compare tail_ln 
 
 clean:
 		-rm -f *.old *.[ce$(SUF)] tail* head*
diff --git a/mach/em44/libcc/compmodule b/mach/em44/libcc/compmodule
index 330b4aef..1c3c2ecf 100755
--- a/mach/em44/libcc/compmodule
+++ b/mach/em44/libcc/compmodule
@@ -1,2 +1,4 @@
-${MACH?} -I../../../h ${MACHFL?} -LIB $1 1>&2
-echo `basename $1 $2`.m
+if ${MACH?} -I../../../h ${MACHFL?} -LIB $1 1>&2
+then echo `basename $1 $2`.m
+else exit 1
+fi
diff --git a/mach/em44/libpc/Makefile b/mach/em44/libpc/Makefile
index e9ad8f68..9258cacd 100644
--- a/mach/em44/libpc/Makefile
+++ b/mach/em44/libpc/Makefile
@@ -1,5 +1,6 @@
+SUF=m
 MAKEFILE=../../proto/libg/Makefile
-MACHDEF="MACH=int44" "SUF=m"
+MACHDEF="MACH=int" "SUF=$(SUF)"
 PCDEF="PREF=pc" "SUB=" "SRC=lang/pc/libpc"
 
 install:
diff --git a/mach/em44/libpc/compmodule b/mach/em44/libpc/compmodule
index 330b4aef..1c3c2ecf 100755
--- a/mach/em44/libpc/compmodule
+++ b/mach/em44/libpc/compmodule
@@ -1,2 +1,4 @@
-${MACH?} -I../../../h ${MACHFL?} -LIB $1 1>&2
-echo `basename $1 $2`.m
+if ${MACH?} -I../../../h ${MACHFL?} -LIB $1 1>&2
+then echo `basename $1 $2`.m
+else exit 1
+fi