From 6d58210806018d249694cc4b74017a186327a9f0 Mon Sep 17 00:00:00 2001
From: dtrg <none@none>
Date: Sun, 25 Feb 2007 12:51:21 +0000
Subject: [PATCH] em_table is now in /h, not /etc.

---
 modules/src/em_code/pmfile |  9 ++++++---
 modules/src/read_em/pmfile | 13 ++++++++-----
 util/ego/pmfile            |  7 +++++--
 util/opt/pmfile            |  7 +++++--
 4 files changed, 24 insertions(+), 12 deletions(-)

diff --git a/modules/src/em_code/pmfile b/modules/src/em_code/pmfile
index 3cba771e6..60ce20d91 100644
--- a/modules/src/em_code/pmfile
+++ b/modules/src/em_code/pmfile
@@ -8,13 +8,13 @@ lib_emk = file (LIBDIR.."libemk.a")
 local em_codeMK_h = simple {
 	outputs = {"%U%-%I%.h"},
 	command = {
-		d.."make.em.gen etc/em_table "..d.."em.nogen > %out%",
+		"%in[1]% %in[2]% "..d.."em.nogen > %out%",
 		"cat "..d.."em.nogen >> %out%"
 	},
 	install = pm.install(HEADERDIR.."em_codeEK.h"),
 	
 	file (d.."make.em.gen"),
-	file ("etc/em_table")
+	file ("%ROOTDIR%h/em_table")
 }
 
 local em_cfile = cfile {
@@ -101,7 +101,10 @@ module_em_code = group {
 
 -- Revision history
 -- $Log$
--- Revision 1.2  2006-10-15 00:28:11  dtrg
+-- Revision 1.3  2007-02-25 12:46:41  dtrg
+-- em_table is now in /h, not /etc.
+--
+-- Revision 1.2  2006/10/15 00:28:11  dtrg
 -- Updated to the version 0.1 of Prime Mover (which involves some syntax changes).
 --
 -- Revision 1.1  2006/07/20 23:18:18  dtrg
diff --git a/modules/src/read_em/pmfile b/modules/src/read_em/pmfile
index 8ae76ac85..1b8dddad7 100644
--- a/modules/src/read_em/pmfile
+++ b/modules/src/read_em/pmfile
@@ -7,21 +7,21 @@ lib_read_emkV = file (LIBDIR.."libread_emkV.a")
 lib_read_emeV = file (LIBDIR.."libread_emeV.a")
 
 local C_mnem_h = simple {
-	command = {"(cd "..d.." && sh %in%) > %out%"},
+	command = {"(cd "..d.." && sh %in[1]% %in[2]%) > %out%"},
 	outputs = {"%U%-%I%.h"},
 	install = pm.install(HEADERDIR.."C_mnem.h"),
 	
 	file (ROOTDIR..d.."m_C_mnem"),
-	file (ROOTDIR.."etc/em_table")
+	file ("%ROOTDIR%h/em_table")
 }
 
 local C_mnem_narg_h = simple {
-	command = {"(cd "..d.." && %in%) > %out%"},
+	command = {"(cd "..d.." && %in[1]% %in[2]%) > %out%"},
 	outputs = {"%U%-%I%.h"},
 	install = pm.install(HEADERDIR.."C_mnem_narg.h"),
 	
 	file (ROOTDIR..d.."m_C_mnem_na"),
-	file (ROOTDIR.."etc/em_table")
+	file ("%ROOTDIR%h/em_table")
 }
 
 local withdynamic = cfile {
@@ -85,7 +85,10 @@ module_read_em = group {
 
 -- Revision history
 -- $Log$
--- Revision 1.2  2006-10-15 00:28:11  dtrg
+-- Revision 1.3  2007-02-25 12:47:10  dtrg
+-- em_table is now in /h, not /etc.
+--
+-- Revision 1.2  2006/10/15 00:28:11  dtrg
 -- Updated to the version 0.1 of Prime Mover (which involves some syntax changes).
 --
 -- Revision 1.1  2006/07/20 23:18:18  dtrg
diff --git a/util/ego/pmfile b/util/ego/pmfile
index 9857f5925..ad38e620d 100644
--- a/util/ego/pmfile
+++ b/util/ego/pmfile
@@ -25,7 +25,7 @@ local pop_push_h = simple {
 	},
 	
 	file (d.."share/pop_push.awk"),
-	file (ROOTDIR.."etc/em_table")
+	file ("%ROOTDIR%h/em_table")
 }
 
 local cfile_with_headers = cfile {
@@ -235,7 +235,10 @@ ego_descr = simple {
 
 -- Revision history
 -- $Log$
--- Revision 1.3  2006-10-15 00:28:12  dtrg
+-- Revision 1.4  2007-02-25 12:49:20  dtrg
+-- em_table is now in /h, not /etc.
+--
+-- Revision 1.3  2006/10/15 00:28:12  dtrg
 -- Updated to the version 0.1 of Prime Mover (which involves some syntax changes).
 --
 -- Revision 1.2  2006/07/23 17:52:23  dtrg
diff --git a/util/opt/pmfile b/util/opt/pmfile
index 8cbcb499f..450f02745 100644
--- a/util/opt/pmfile
+++ b/util/opt/pmfile
@@ -36,7 +36,7 @@ local local_tool_opt = cprogram {
 			},
 			
 			file (d.."pop_push.awk"),
-			file (ROOTDIR.."etc/em_table")
+			file ("%ROOTDIR%h/em_table")
 		}
 	},
 
@@ -98,7 +98,10 @@ tool_opt = group {
 
 -- Revision history
 -- $Log$
--- Revision 1.4  2007-02-20 00:27:01  dtrg
+-- Revision 1.5  2007-02-25 12:51:21  dtrg
+-- em_table is now in /h, not /etc.
+--
+-- Revision 1.4  2007/02/20 00:27:01  dtrg
 -- Fixed a compilation error that was causing opt to not have its
 -- peephole optimisation tables, which would make it generate
 -- duff code.