From 931ed32bebe0680f17fdf719f2ddf50bc4de861c Mon Sep 17 00:00:00 2001
From: Joel Sherrill <joel.sherrill@OARcorp.com>
Date: Tue, 1 Feb 2011 22:46:44 +0000
Subject: 2011-02-01	Joel Sherrill <joel.sherrill@oarcorp.com>

	* Makefile.am, preinstall.am, trap34/console-io.c: Install syscall.h as
	bsp/syscall.h to avoid confusing autoconf.
---
 c/src/lib/libbsp/sh/shsim/ChangeLog           | 5 +++++
 c/src/lib/libbsp/sh/shsim/Makefile.am         | 2 +-
 c/src/lib/libbsp/sh/shsim/preinstall.am       | 8 ++++----
 c/src/lib/libbsp/sh/shsim/trap34/console-io.c | 4 ++--
 4 files changed, 12 insertions(+), 7 deletions(-)

(limited to 'c')

diff --git a/c/src/lib/libbsp/sh/shsim/ChangeLog b/c/src/lib/libbsp/sh/shsim/ChangeLog
index 8de856d836..1e7431f28d 100644
--- a/c/src/lib/libbsp/sh/shsim/ChangeLog
+++ b/c/src/lib/libbsp/sh/shsim/ChangeLog
@@ -1,3 +1,8 @@
+2011-02-01	Joel Sherrill <joel.sherrill@oarcorp.com>
+
+	* Makefile.am, preinstall.am, trap34/console-io.c: Install syscall.h as
+	bsp/syscall.h to avoid confusing autoconf.
+
 2010-04-07	Joel Sherrill <joel.sherrill@oarcorp.com>
 
 	* start/start.S: Verify boot_card() is passed a NULL.
diff --git a/c/src/lib/libbsp/sh/shsim/Makefile.am b/c/src/lib/libbsp/sh/shsim/Makefile.am
index 05e44c8499..85c8e07401 100644
--- a/c/src/lib/libbsp/sh/shsim/Makefile.am
+++ b/c/src/lib/libbsp/sh/shsim/Makefile.am
@@ -7,11 +7,11 @@ ACLOCAL_AMFLAGS = -I ../../../../aclocal
 include $(top_srcdir)/../../../../automake/compile.am
 
 include_bspdir = $(includedir)/bsp
+include_bsp_HEADERS = include/syscall.h
 
 dist_project_lib_DATA = bsp_specs
 
 include_HEADERS = include/bsp.h
-include_HEADERS += include/syscall.h
 include_HEADERS += ../../shared/include/tm27.h
 
 nodist_include_HEADERS = include/bspopts.h
diff --git a/c/src/lib/libbsp/sh/shsim/preinstall.am b/c/src/lib/libbsp/sh/shsim/preinstall.am
index f6fa6846d7..9e08790208 100644
--- a/c/src/lib/libbsp/sh/shsim/preinstall.am
+++ b/c/src/lib/libbsp/sh/shsim/preinstall.am
@@ -33,6 +33,10 @@ $(PROJECT_INCLUDE)/bsp/$(dirstamp):
 	@: > $(PROJECT_INCLUDE)/bsp/$(dirstamp)
 PREINSTALL_DIRS += $(PROJECT_INCLUDE)/bsp/$(dirstamp)
 
+$(PROJECT_INCLUDE)/bsp/syscall.h: include/syscall.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/syscall.h
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/syscall.h
+
 $(PROJECT_LIB)/bsp_specs: bsp_specs $(PROJECT_LIB)/$(dirstamp)
 	$(INSTALL_DATA) $< $(PROJECT_LIB)/bsp_specs
 PREINSTALL_FILES += $(PROJECT_LIB)/bsp_specs
@@ -41,10 +45,6 @@ $(PROJECT_INCLUDE)/bsp.h: include/bsp.h $(PROJECT_INCLUDE)/$(dirstamp)
 	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp.h
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp.h
 
-$(PROJECT_INCLUDE)/syscall.h: include/syscall.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/syscall.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/syscall.h
-
 $(PROJECT_INCLUDE)/tm27.h: ../../shared/include/tm27.h $(PROJECT_INCLUDE)/$(dirstamp)
 	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/tm27.h
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/tm27.h
diff --git a/c/src/lib/libbsp/sh/shsim/trap34/console-io.c b/c/src/lib/libbsp/sh/shsim/trap34/console-io.c
index a4fa13cd61..74944eb8fa 100644
--- a/c/src/lib/libbsp/sh/shsim/trap34/console-io.c
+++ b/c/src/lib/libbsp/sh/shsim/trap34/console-io.c
@@ -4,7 +4,7 @@
  *
  *  Logic based on newlib-1.8.2/newlib/libc/sys/sh/syscalls.c
  *
- *  COPYRIGHT (c) 1989-2000.
+ *  COPYRIGHT (c) 1989-2011.
  *  On-Line Applications Research Corporation (OAR).
  *
  *  The license and distribution terms for this file may be
@@ -19,7 +19,7 @@
 #include <stdlib.h>
 #include <assert.h>
 
-#include <syscall.h>
+#include <bsp/syscall.h>
 
 int errno;
 
-- 
cgit v1.2.3