3 files changed, 14 insertions, 7 deletions
diff --git a/c/src/lib/libbsp/i386/pc386/include/.cvsignore b/c/src/lib/libbsp/i386/pc386/include/.cvsignore
index 282522db03..b0be3c54e6 100644
--- a/c/src/lib/libbsp/i386/pc386/include/.cvsignore
+++ b/c/src/lib/libbsp/i386/pc386/include/.cvsignore
@@ -1,2 +1,6 @@
 Makefile
 Makefile.in
+bspopts.h
+bspopts.h.in
+stamp-h
+stamp-h.in
diff --git a/c/src/lib/libbsp/i386/pc386/include/Makefile.am b/c/src/lib/libbsp/i386/pc386/include/Makefile.am
index 2f4544274f..d8548df2c8 100644
--- a/c/src/lib/libbsp/i386/pc386/include/Makefile.am
+++ b/c/src/lib/libbsp/i386/pc386/include/Makefile.am
@@ -10,7 +10,11 @@ if HAS_NETWORKING
 WD80X3 = wd80x3.h
 endif
 
-H_FILES = bsp.h crt.h $(WD80X3)
+include_HEADERS = bsp.h crt.h coverhd.h $(WD80X3) bspopts.h
+
+coverhd.h: $(top_srcdir)/../../shared/include/coverhd.h
+	cp $< $@
+CLEANFILES += coverhd.h
 
 $(PROJECT_INCLUDE):
 	$(mkinstalldirs) $@
@@ -18,14 +22,11 @@ $(PROJECT_INCLUDE):
 $(PROJECT_INCLUDE)/%.h: %.h
 	$(INSTALL_DATA) $< $@
 
-$(PROJECT_INCLUDE)/coverhd.h: $(top_srcdir)/../../shared/include/coverhd.h
-	$(INSTALL_DATA) $< $@
-
-PREINSTALL_FILES += $(PROJECT_INCLUDE) $(H_FILES:%.h=$(PROJECT_INCLUDE)/%.h) \
-    $(PROJECT_INCLUDE)/coverhd.h
+PREINSTALL_FILES += $(PROJECT_INCLUDE) \
+    $(include_HEADERS:%=$(PROJECT_INCLUDE)/%)
 
 all-local: $(PREINSTALL_FILES)
 
-EXTRA_DIST = bsp.h crt.h wd80x3.h
+EXTRA_DIST = wd80x3.h
 
 include $(top_srcdir)/../../../../../../automake/local.am
diff --git a/c/src/lib/libbsp/i386/pc386/include/bsp.h b/c/src/lib/libbsp/i386/pc386/include/bsp.h
index 7431059314..703492bb4f 100644
--- a/c/src/lib/libbsp/i386/pc386/include/bsp.h
+++ b/c/src/lib/libbsp/i386/pc386/include/bsp.h
@@ -46,6 +46,8 @@
 extern "C" {
 #endif
 
+#include <bspopts.h>
+
 #include <rtems.h>
 #include <iosupp.h>
 #include <console.h>