From ace59999fda1e9eb4bef7f09cfcdc6d22107e973 Mon Sep 17 00:00:00 2001
From: Bob Burger <burgerrg@gmail.com>
Date: Thu, 3 May 2018 14:15:25 -0400
Subject: [PATCH] Don't install equates.h

original commit: 7c86c154e9d175370ed4ae5f67201ff7e466ca02
---
 LOG                     | 2 ++
 makefiles/Mf-install.in | 1 -
 wininstall/a6nt.wxs     | 4 ----
 wininstall/i3nt.wxs     | 4 ----
 wininstall/ta6nt.wxs    | 4 ----
 wininstall/ti3nt.wxs    | 4 ----
 6 files changed, 2 insertions(+), 17 deletions(-)

diff --git a/LOG b/LOG
index d9e657fe6b..911b21e6c7 100644
--- a/LOG
+++ b/LOG
@@ -931,3 +931,5 @@
     cp0.ss, cpcheck.ss, cpvalid.ss, interpret.ss, cpletrec.ss,
     thread.c, prim.c, externs.h, foreign.stex, release_notes.stex,
     mats/Mf-t*, foreign.ms, foreign4.c
+- Don't install equates.h
+    Mf-install.in, wininstall/*nt.wxs
diff --git a/makefiles/Mf-install.in b/makefiles/Mf-install.in
index 6446561664..39d831f1ea 100644
--- a/makefiles/Mf-install.in
+++ b/makefiles/Mf-install.in
@@ -123,7 +123,6 @@ libbininstall: ${LibBin}
           ln -f ${LibBin}/scheme.boot ${LibBin}/${InstallSchemeName}.boot;\
         fi
 	ln -sf ${LibBin}/scheme.boot ${LibBin}/${InstallScriptName}.boot;
-	$I -m 444 ${Include}/equates.h ${LibBin}
 	$I -m 444 ${Include}/kernel.o ${LibBin}
 	$I -m 444 ${Include}/main.o ${LibBin}
 	$I -m 444 ${Include}/scheme.h ${LibBin}
diff --git a/wininstall/a6nt.wxs b/wininstall/a6nt.wxs
index 705c64e189..d511ffe1d6 100755
--- a/wininstall/a6nt.wxs
+++ b/wininstall/a6nt.wxs
@@ -36,9 +36,6 @@
         <Component Id="cmp41A0F324C636C03565EFAB5DC1197958" Guid="*">
           <File Id="fil0052F236986BD25DFE0D0DE76854483B" KeyPath="yes" Source="..\a6nt\boot\a6nt\csv951mt.lib" />
         </Component>
-        <Component Id="cmpADF89AD422C8D19CB81467929675B464" Guid="*">
-          <File Id="filCB1F753C10906E69F21EE976B6E28703" KeyPath="yes" Source="..\a6nt\boot\a6nt\equates.h" />
-        </Component>
         <Component Id="cmp08025CB77BA01465D21171D27231AE6A" Guid="*">
           <File Id="fil7FF609B8D0F6C6E984910D4458F7B76B" KeyPath="yes" Source="..\a6nt\boot\a6nt\mainmd.obj" />
         </Component>
@@ -67,7 +64,6 @@
       <ComponentRef Id="cmpDD19E9A8DE8058599CFC66AF8DB39487" />
       <ComponentRef Id="cmpB8AFC5E7298C4FB423F21E474D718248" />
       <ComponentRef Id="cmp41A0F324C636C03565EFAB5DC1197958" />
-      <ComponentRef Id="cmpADF89AD422C8D19CB81467929675B464" />
       <ComponentRef Id="cmp08025CB77BA01465D21171D27231AE6A" />
       <ComponentRef Id="cmp9A2A63AC4024CDB5A4AB32201F5CCF90" />
       <ComponentRef Id="cmp16473ADACEED364D590D03625C25E89F" />
diff --git a/wininstall/i3nt.wxs b/wininstall/i3nt.wxs
index caf37bf93e..a4ede0c6af 100755
--- a/wininstall/i3nt.wxs
+++ b/wininstall/i3nt.wxs
@@ -36,9 +36,6 @@
         <Component Id="cmp97E86E3E78EC5C1E35333413F9D239A9" Guid="*">
           <File Id="filC2A38DD4D83F793279D6D10E8D553145" KeyPath="yes" Source="..\i3nt\boot\i3nt\csv951mt.lib" />
         </Component>
-        <Component Id="cmpA984DD6C19B2AF6FB1CF1EB8B82265F7" Guid="*">
-          <File Id="fil01A92E9B0A1BED208B24F65BE7808680" KeyPath="yes" Source="..\i3nt\boot\i3nt\equates.h" />
-        </Component>
         <Component Id="cmp4EC08D9AF0D6DADE3077A7EB099476B4" Guid="*">
           <File Id="fil47E4EBA05B181E80FAF43A5B84DCC1D6" KeyPath="yes" Source="..\i3nt\boot\i3nt\mainmd.obj" />
         </Component>
@@ -67,7 +64,6 @@
       <ComponentRef Id="cmpE28E1FD7F26C181DE59FFBF90644FC76" />
       <ComponentRef Id="cmp47E339F22F1D268C3D889C89DC04B1EC" />
       <ComponentRef Id="cmp97E86E3E78EC5C1E35333413F9D239A9" />
-      <ComponentRef Id="cmpA984DD6C19B2AF6FB1CF1EB8B82265F7" />
       <ComponentRef Id="cmp4EC08D9AF0D6DADE3077A7EB099476B4" />
       <ComponentRef Id="cmp919AB6246AC9B090D079FECBCF9B3758" />
       <ComponentRef Id="cmpAA816697285A56C59BE524C8F381935D" />
diff --git a/wininstall/ta6nt.wxs b/wininstall/ta6nt.wxs
index 343bd699c2..ba4f9dc67c 100755
--- a/wininstall/ta6nt.wxs
+++ b/wininstall/ta6nt.wxs
@@ -36,9 +36,6 @@
         <Component Id="cmpD7880184C113065E511275EFD531D589" Guid="*">
           <File Id="filDC2D7E1DB036BAE5B7FFA7FE14F3CD69" KeyPath="yes" Source="..\ta6nt\boot\ta6nt\csv951mt.lib" />
         </Component>
-        <Component Id="cmp19832A9F8ABA24EE5E11B447538AC375" Guid="*">
-          <File Id="fil7626314F25A516DCC7C61AC8BA501397" KeyPath="yes" Source="..\ta6nt\boot\ta6nt\equates.h" />
-        </Component>
         <Component Id="cmp5211817ED85951CDAF2FD5E2419BD211" Guid="*">
           <File Id="fil21839A8D4062A72DEAB3156D77EEE82A" KeyPath="yes" Source="..\ta6nt\boot\ta6nt\mainmd.obj" />
         </Component>
@@ -67,7 +64,6 @@
       <ComponentRef Id="cmpDEB15B7CB19176296C92E8032592FDB4" />
       <ComponentRef Id="cmpCBDB945622604667783C3C57A0427DF5" />
       <ComponentRef Id="cmpD7880184C113065E511275EFD531D589" />
-      <ComponentRef Id="cmp19832A9F8ABA24EE5E11B447538AC375" />
       <ComponentRef Id="cmp5211817ED85951CDAF2FD5E2419BD211" />
       <ComponentRef Id="cmpD21D824506A948F172A50CECA2B6D0AC" />
       <ComponentRef Id="cmpB650D26FBD85BF1F56C4AA76A9CFBD7E" />
diff --git a/wininstall/ti3nt.wxs b/wininstall/ti3nt.wxs
index ab778924c1..ef7766a8ec 100755
--- a/wininstall/ti3nt.wxs
+++ b/wininstall/ti3nt.wxs
@@ -36,9 +36,6 @@
         <Component Id="cmpF3038779EA05930E72A29C15DC2D64B2" Guid="*">
           <File Id="filFB335FE01A6D5ED27AD2BC179DB8E265" KeyPath="yes" Source="..\ti3nt\boot\ti3nt\csv951mt.lib" />
         </Component>
-        <Component Id="cmp1160AED2163132A66233F97AEB4C5455" Guid="*">
-          <File Id="fil41785B9A658FDA80236160CA848C8C59" KeyPath="yes" Source="..\ti3nt\boot\ti3nt\equates.h" />
-        </Component>
         <Component Id="cmp9DDE0523EFC5EEA983DE3CFA0F493908" Guid="*">
           <File Id="fil139F59D34D1A013CCB2AEC11507287AA" KeyPath="yes" Source="..\ti3nt\boot\ti3nt\mainmd.obj" />
         </Component>
@@ -69,7 +66,6 @@
       <ComponentRef Id="cmp10BA4CB7C0EB863E5ADE7BC00B949622" />
       <ComponentRef Id="cmp7099C9EB3F487AAFE3A880CED21FA9C2" />
       <ComponentRef Id="cmpF3038779EA05930E72A29C15DC2D64B2" />
-      <ComponentRef Id="cmp1160AED2163132A66233F97AEB4C5455" />
       <ComponentRef Id="cmp9DDE0523EFC5EEA983DE3CFA0F493908" />
       <ComponentRef Id="cmp0CE1CF2FA5322014A0FB6C493C207238" />
       <ComponentRef Id="cmp4ACC4A5EDBBBF3A5B4AEEC2E85AD92B0" />