From b53634fa730f83cf78c56017d27ce4148934e1b8 Mon Sep 17 00:00:00 2001
From: ceriel <none@none>
Date: Wed, 28 Aug 1991 11:28:56 +0000
Subject: [PATCH] New installation mechanism

---
 mach/m68k2/ncg/.distr     |  6 +-----
 mach/m68k2/ncg/table_dir  |  1 +
 mach/m68k4/ncg/.distr     |  9 +--------
 mach/m68k4/ncg/table_dir  |  1 +
 mach/moon3/ncg/.distr     |  2 ++
 mach/moon3/ncg/table_dir  |  1 +
 mach/proto/ncg/proto.make | 17 ++++++++++-------
 7 files changed, 17 insertions(+), 20 deletions(-)
 create mode 100644 mach/m68k2/ncg/table_dir
 create mode 100644 mach/m68k4/ncg/table_dir
 create mode 100644 mach/moon3/ncg/.distr
 create mode 100644 mach/moon3/ncg/table_dir

diff --git a/mach/m68k2/ncg/.distr b/mach/m68k2/ncg/.distr
index 5daea746e..052914faf 100644
--- a/mach/m68k2/ncg/.distr
+++ b/mach/m68k2/ncg/.distr
@@ -1,6 +1,2 @@
-README
-instrmacs.h
-mach.c
-mach.h
-table_link
+table_dir
 whichone.h
diff --git a/mach/m68k2/ncg/table_dir b/mach/m68k2/ncg/table_dir
new file mode 100644
index 000000000..5dc880280
--- /dev/null
+++ b/mach/m68k2/ncg/table_dir
@@ -0,0 +1 @@
+TABLE_DIR = $(SRC_HOME)/mach/m68020/ncg
diff --git a/mach/m68k4/ncg/.distr b/mach/m68k4/ncg/.distr
index 3a0199118..052914faf 100644
--- a/mach/m68k4/ncg/.distr
+++ b/mach/m68k4/ncg/.distr
@@ -1,9 +1,2 @@
-Makefile
-README
-mach.c
-mach.h
-table
+table_dir
 whichone.h
-instrmacs.h
-tables1.c
-tables1.h
diff --git a/mach/m68k4/ncg/table_dir b/mach/m68k4/ncg/table_dir
new file mode 100644
index 000000000..5dc880280
--- /dev/null
+++ b/mach/m68k4/ncg/table_dir
@@ -0,0 +1 @@
+TABLE_DIR = $(SRC_HOME)/mach/m68020/ncg
diff --git a/mach/moon3/ncg/.distr b/mach/moon3/ncg/.distr
new file mode 100644
index 000000000..052914faf
--- /dev/null
+++ b/mach/moon3/ncg/.distr
@@ -0,0 +1,2 @@
+table_dir
+whichone.h
diff --git a/mach/moon3/ncg/table_dir b/mach/moon3/ncg/table_dir
new file mode 100644
index 000000000..5dc880280
--- /dev/null
+++ b/mach/moon3/ncg/table_dir
@@ -0,0 +1 @@
+TABLE_DIR = $(SRC_HOME)/mach/m68020/ncg
diff --git a/mach/proto/ncg/proto.make b/mach/proto/ncg/proto.make
index a9347259c..298dc2a53 100644
--- a/mach/proto/ncg/proto.make
+++ b/mach/proto/ncg/proto.make
@@ -5,6 +5,9 @@
 #MACH_DEFINE	do not remove this or the next line!
 MACH = 
 
+#TABLE_DEFINE	do not remove this or the next line!
+TABLE_DIR = $(SRC_HOME)/mach/$(MACH)/ncg
+
 SRC_DIR = $(SRC_HOME)/mach/$(MACH)/ncg
 CDIR = $(SRC_HOME)/mach/proto/ncg
 LIBEM = $(TARGET_HOME)/lib.bin/em_data.$(LIBSUF)
@@ -17,7 +20,7 @@ TABLEFLAGS=
 #cgg options
 CGGFLAGS=
 
-PREFLAGS=-I$(TARGET_HOME)/h -I$(SRC_HOME)/mach -I$(TARGET_HOME)/modules/h -I$(SRC_DIR) -I. -I$(CDIR) -DNDEBUG
+PREFLAGS=-I$(TARGET_HOME)/h -I$(SRC_HOME)/mach -I$(TARGET_HOME)/modules/h -I$(SRC_DIR) -I$(TABLE_DIR) -I. -I$(CDIR) -DNDEBUG
 PFLAGS=
 CFLAGS=$(PREFLAGS) $(PFLAGS) $(COPTIONS)
 LDFLAGS=$(PFLAGS) $(LDOPTIONS)
@@ -75,13 +78,13 @@ var.$(SUF): $(CDIR)/var.c
 	$(CC) -c $(CFLAGS) $(CDIR)/var.c
 
 install: all
-	cp cg $(TARGET_MOME)/lib.bin/$(MACH)/cg
+	cp cg $(TARGET_HOME)/lib.bin/$(MACH)/cg
 
 cmp:	 all
-	-cmp cg $(TARGET_MOME)/lib.bin/$(MACH)/cg
+	-cmp cg $(TARGET_HOME)/lib.bin/$(MACH)/cg
 
-tables.c: $(SRC_HOME)/$(TABLE) $(CGG)
-	$(CPP) -I$(SRC_DIR) $(TABLEFLAGS) $(SRC_HOME)/$(TABLE) | $(CGG) $(CGGFLAGS)
+tables.c: $(TABLE_DIR)/table $(CGG)
+	$(CPP) -I$(SRC_DIR) -I$(TABLE_DIR) $(TABLEFLAGS) $(TABLE_DIR)/table | $(CGG) $(CGGFLAGS)
 	-cmp tables.h tables.H || cp tables.H tables.h
 
 lint:	tables.c
@@ -118,8 +121,8 @@ equiv.$(SUF):	$(CDIR)/types.h
 fillem.$(SUF):	$(CDIR)/assert.h $(TARGET_HOME)/h/cgg_cg.h
 fillem.$(SUF):	$(CDIR)/data.h
 fillem.$(SUF):	$(CDIR)/extern.h
-fillem.$(SUF):	$(SRC_DIR)/mach.c
-fillem.$(SUF):	$(SRC_DIR)/mach.h
+fillem.$(SUF):	$(TABLE_DIR)/mach.c
+fillem.$(SUF):	$(TABLE_DIR)/mach.h
 fillem.$(SUF):	$(CDIR)/param.h
 fillem.$(SUF):	$(CDIR)/regvar.h
 fillem.$(SUF):	$(CDIR)/result.h