5 files changed, 29 insertions, 20 deletions
diff --git a/cpukit/libfs/src/Makefile.am b/cpukit/libfs/src/Makefile.am
index dff205eaaa..5c6597fb83 100644
--- a/cpukit/libfs/src/Makefile.am
+++ b/cpukit/libfs/src/Makefile.am
@@ -5,5 +5,5 @@
 
 SUBDIRS = imfs dosfs
 
-include $(top_srcdir)/../automake/subdirs.am
-include $(top_srcdir)/../automake/local.am
+include $(top_srcdir)/automake/subdirs.am
+include $(top_srcdir)/automake/local.am
diff --git a/cpukit/libfs/src/dosfs/Makefile.am b/cpukit/libfs/src/dosfs/Makefile.am
index f0094a6710..f3adb0868d 100644
--- a/cpukit/libfs/src/dosfs/Makefile.am
+++ b/cpukit/libfs/src/dosfs/Makefile.am
@@ -3,11 +3,13 @@
 ##
 
 
-include $(top_srcdir)/../automake/multilib.am
-include $(top_srcdir)/../automake/compile.am
-include $(top_srcdir)/../automake/lib.am
+include $(top_srcdir)/automake/multilib.am
+include $(top_srcdir)/automake/compile.am
+include $(top_srcdir)/automake/lib.am
 
-AM_CPPFLAGS += -I../.. $(LIBC_DEFINES) 
+noinst_HEADERS = config.h
+
+AM_CPPFLAGS += $(LIBC_DEFINES) 
 
 FATFS_C_FILES = fat.c fat_fat_operations.c fat_file.c
 
@@ -50,4 +52,4 @@ TMPINSTALL_FILES += $(H_FILES)
 
 EXTRA_DIST = $(DOSFS_C_FILES) $(FATFS_C_FILES)
 
-include $(top_srcdir)/../automake/local.am
+include $(top_srcdir)/automake/local.am
diff --git a/cpukit/libfs/src/dosfs/config.h b/cpukit/libfs/src/dosfs/config.h
new file mode 100644
index 0000000000..09fe652e2c
--- /dev/null
+++ b/cpukit/libfs/src/dosfs/config.h
@@ -0,0 +1,5 @@
+/* HACK: 
+ * Pull-in RTEMS global config-header cpuopts.h as local config.h 
+ */
+
+#include <rtems/score/cpuopts.h>
diff --git a/cpukit/libfs/src/imfs/Makefile.am b/cpukit/libfs/src/imfs/Makefile.am
index 0f7e631eaf..29174ad04b 100644
--- a/cpukit/libfs/src/imfs/Makefile.am
+++ b/cpukit/libfs/src/imfs/Makefile.am
@@ -19,22 +19,22 @@ UNIX_C_FILES = imfs_unixstub.c
 
 EMBEDDED_C_FILES = $(IMFS_C_FILES)
 
-COMMON_C_FILES =
-
 if UNIX
-C_FILES = $(COMMON_C_FILES) $(UNIX_C_FILES)
+C_FILES = $(UNIX_C_FILES)
 else
-C_FILES = $(COMMON_C_FILES) $(EMBEDDED_C_FILES)
+C_FILES = $(EMBEDDED_C_FILES)
 endif
 OBJS = $(C_FILES:%.c=${ARCH}/%.$(OBJEXT))
 
+noinst_HEADERS = config.h
+
 include_HEADERS = imfs.h
 
-include $(top_srcdir)/../automake/multilib.am
-include $(top_srcdir)/../automake/compile.am
-include $(top_srcdir)/../automake/lib.am
+include $(top_srcdir)/automake/multilib.am
+include $(top_srcdir)/automake/compile.am
+include $(top_srcdir)/automake/lib.am
 
-AM_CPPFLAGS += -I../.. $(LIBC_DEFINES)
+AM_CPPFLAGS += $(LIBC_DEFINES)
 
 PREINSTALL_FILES = $(PROJECT_INCLUDE) \
     $(include_HEADERS:%=$(PROJECT_INCLUDE)/%)
@@ -54,9 +54,6 @@ all-local: ${ARCH} $(LIB)
 $(LIB): ${OBJS}
 	$(make-library)
 
-DOC_FILES = TODO CASES
-
-EXTRA_DIST = $(DOC_FILES) $(COMMON_C_FILES) $(EMBEDDED_C_FILES) \
-    $(UNIX_C_FILES)
+EXTRA_DIST = $(EMBEDDED_C_FILES) $(UNIX_C_FILES)
 
-include $(top_srcdir)/../automake/local.am
+include $(top_srcdir)/automake/local.am
diff --git a/cpukit/libfs/src/imfs/config.h b/cpukit/libfs/src/imfs/config.h
new file mode 100644
index 0000000000..09fe652e2c
--- /dev/null
+++ b/cpukit/libfs/src/imfs/config.h
@@ -0,0 +1,5 @@
+/* HACK: 
+ * Pull-in RTEMS global config-header cpuopts.h as local config.h 
+ */
+
+#include <rtems/score/cpuopts.h>