diff --git a/mach/6500/cg/Makefile b/mach/6500/cg/Makefile
index 522d02add..d9ceb73f9 100644
--- a/mach/6500/cg/Makefile
+++ b/mach/6500/cg/Makefile
@@ -63,10 +63,8 @@ cmp:	 all
 
 
 tables.c: table
-	-mv tables.h tables.h.save
-	../../../lib/cpp -P table | ../../../lib/cgg > debug.out
-	-if cmp -s tables.h.save tables.h; then mv tables.h.save tables.h; else exit 0; fi
-	-if cmp -s /dev/null tables.h; then mv tables.h.save tables.h; else exit 0; fi
+	../../../lib/cpp -P table | ../../../lib/cgg -htables.H > debug.out
+	-cmp -s tables.h tables.H || mv tables.H tables.h
 
 lint: $(CFILES)
 	lint $(LINTOPTS) $(PREFLAGS) $(CFILES)
diff --git a/mach/pdp/cg/Makefile b/mach/pdp/cg/Makefile
index 522d02add..d9ceb73f9 100644
--- a/mach/pdp/cg/Makefile
+++ b/mach/pdp/cg/Makefile
@@ -63,10 +63,8 @@ cmp:	 all
 
 
 tables.c: table
-	-mv tables.h tables.h.save
-	../../../lib/cpp -P table | ../../../lib/cgg > debug.out
-	-if cmp -s tables.h.save tables.h; then mv tables.h.save tables.h; else exit 0; fi
-	-if cmp -s /dev/null tables.h; then mv tables.h.save tables.h; else exit 0; fi
+	../../../lib/cpp -P table | ../../../lib/cgg -htables.H > debug.out
+	-cmp -s tables.h tables.H || mv tables.H tables.h
 
 lint: $(CFILES)
 	lint $(LINTOPTS) $(PREFLAGS) $(CFILES)
diff --git a/mach/proto/cg/Makefile b/mach/proto/cg/Makefile
index 522d02add..d9ceb73f9 100644
--- a/mach/proto/cg/Makefile
+++ b/mach/proto/cg/Makefile
@@ -63,10 +63,8 @@ cmp:	 all
 
 
 tables.c: table
-	-mv tables.h tables.h.save
-	../../../lib/cpp -P table | ../../../lib/cgg > debug.out
-	-if cmp -s tables.h.save tables.h; then mv tables.h.save tables.h; else exit 0; fi
-	-if cmp -s /dev/null tables.h; then mv tables.h.save tables.h; else exit 0; fi
+	../../../lib/cpp -P table | ../../../lib/cgg -htables.H > debug.out
+	-cmp -s tables.h tables.H || mv tables.H tables.h
 
 lint: $(CFILES)
 	lint $(LINTOPTS) $(PREFLAGS) $(CFILES)
diff --git a/mach/vax4/cg/Makefile b/mach/vax4/cg/Makefile
index 522d02add..d9ceb73f9 100644
--- a/mach/vax4/cg/Makefile
+++ b/mach/vax4/cg/Makefile
@@ -63,10 +63,8 @@ cmp:	 all
 
 
 tables.c: table
-	-mv tables.h tables.h.save
-	../../../lib/cpp -P table | ../../../lib/cgg > debug.out
-	-if cmp -s tables.h.save tables.h; then mv tables.h.save tables.h; else exit 0; fi
-	-if cmp -s /dev/null tables.h; then mv tables.h.save tables.h; else exit 0; fi
+	../../../lib/cpp -P table | ../../../lib/cgg -htables.H > debug.out
+	-cmp -s tables.h tables.H || mv tables.H tables.h
 
 lint: $(CFILES)
 	lint $(LINTOPTS) $(PREFLAGS) $(CFILES)
diff --git a/mach/z80/cg/Makefile b/mach/z80/cg/Makefile
index 522d02add..d9ceb73f9 100644
--- a/mach/z80/cg/Makefile
+++ b/mach/z80/cg/Makefile
@@ -63,10 +63,8 @@ cmp:	 all
 
 
 tables.c: table
-	-mv tables.h tables.h.save
-	../../../lib/cpp -P table | ../../../lib/cgg > debug.out
-	-if cmp -s tables.h.save tables.h; then mv tables.h.save tables.h; else exit 0; fi
-	-if cmp -s /dev/null tables.h; then mv tables.h.save tables.h; else exit 0; fi
+	../../../lib/cpp -P table | ../../../lib/cgg -htables.H > debug.out
+	-cmp -s tables.h tables.H || mv tables.H tables.h
 
 lint: $(CFILES)
 	lint $(LINTOPTS) $(PREFLAGS) $(CFILES)
diff --git a/mach/z8000/cg/Makefile b/mach/z8000/cg/Makefile
index 522d02add..d9ceb73f9 100644
--- a/mach/z8000/cg/Makefile
+++ b/mach/z8000/cg/Makefile
@@ -63,10 +63,8 @@ cmp:	 all
 
 
 tables.c: table
-	-mv tables.h tables.h.save
-	../../../lib/cpp -P table | ../../../lib/cgg > debug.out
-	-if cmp -s tables.h.save tables.h; then mv tables.h.save tables.h; else exit 0; fi
-	-if cmp -s /dev/null tables.h; then mv tables.h.save tables.h; else exit 0; fi
+	../../../lib/cpp -P table | ../../../lib/cgg -htables.H > debug.out
+	-cmp -s tables.h tables.H || mv tables.H tables.h
 
 lint: $(CFILES)
 	lint $(LINTOPTS) $(PREFLAGS) $(CFILES)