From a45e77c4a2aaa651dcc5058a7ea931e5e204b3b6 Mon Sep 17 00:00:00 2001
From: peter <peter@freepascal.org>
Date: Sun, 15 Oct 2000 09:41:37 +0000
Subject: [PATCH]   * move also the i386*.inc to i386/

---
 compiler/Makefile                | 6 ++++++
 compiler/Makefile.fpc            | 1 +
 compiler/{ => i386}/i386att.inc  | 0
 compiler/{ => i386}/i386atts.inc | 0
 compiler/{ => i386}/i386int.inc  | 0
 compiler/{ => i386}/i386nop.inc  | 0
 compiler/{ => i386}/i386op.inc   | 0
 compiler/{ => i386}/i386prop.inc | 0
 compiler/{ => i386}/i386tab.inc  | 0
 9 files changed, 7 insertions(+)
 rename compiler/{ => i386}/i386att.inc (100%)
 rename compiler/{ => i386}/i386atts.inc (100%)
 rename compiler/{ => i386}/i386int.inc (100%)
 rename compiler/{ => i386}/i386nop.inc (100%)
 rename compiler/{ => i386}/i386op.inc (100%)
 rename compiler/{ => i386}/i386prop.inc (100%)
 rename compiler/{ => i386}/i386tab.inc (100%)

diff --git a/compiler/Makefile b/compiler/Makefile
index 9bbab9e2c3..f7a1829f5b 100644
--- a/compiler/Makefile
+++ b/compiler/Makefile
@@ -241,6 +241,7 @@ override NEEDOPT=-Sg
 # Directories
 
 override NEEDUNITDIR=$(CPU_TARGET)
+override NEEDINCDIR=$(CPU_TARGET)
 ifndef TARGETDIR
 TARGETDIR=.
 endif
@@ -863,6 +864,11 @@ ifdef UNITSDIR
 override FPCOPT+=-Fu$(UNITSDIR)
 endif
 
+ifdef NEEDINCDIR
+override FPCOPT+=$(addprefix -Fi,$(NEEDINCDIR))
+endif
+
+
 # Target dirs and the prefix to use for clean/install
 ifdef TARGETDIR
 override FPCOPT+=-FE$(TARGETDIR)
diff --git a/compiler/Makefile.fpc b/compiler/Makefile.fpc
index a5d36b68f0..d9e57d0abb 100644
--- a/compiler/Makefile.fpc
+++ b/compiler/Makefile.fpc
@@ -6,6 +6,7 @@
 fpcdir=..
 targetdir=.
 unitdir=$(CPU_TARGET)
+incdir=$(CPU_TARGET)
 
 [install]
 packagename=compiler
diff --git a/compiler/i386att.inc b/compiler/i386/i386att.inc
similarity index 100%
rename from compiler/i386att.inc
rename to compiler/i386/i386att.inc
diff --git a/compiler/i386atts.inc b/compiler/i386/i386atts.inc
similarity index 100%
rename from compiler/i386atts.inc
rename to compiler/i386/i386atts.inc
diff --git a/compiler/i386int.inc b/compiler/i386/i386int.inc
similarity index 100%
rename from compiler/i386int.inc
rename to compiler/i386/i386int.inc
diff --git a/compiler/i386nop.inc b/compiler/i386/i386nop.inc
similarity index 100%
rename from compiler/i386nop.inc
rename to compiler/i386/i386nop.inc
diff --git a/compiler/i386op.inc b/compiler/i386/i386op.inc
similarity index 100%
rename from compiler/i386op.inc
rename to compiler/i386/i386op.inc
diff --git a/compiler/i386prop.inc b/compiler/i386/i386prop.inc
similarity index 100%
rename from compiler/i386prop.inc
rename to compiler/i386/i386prop.inc
diff --git a/compiler/i386tab.inc b/compiler/i386/i386tab.inc
similarity index 100%
rename from compiler/i386tab.inc
rename to compiler/i386/i386tab.inc