3 files changed, 16 insertions, 8 deletions
diff --git a/c/src/libnetworking/rtems/Makefile.am b/c/src/libnetworking/rtems/Makefile.am
index 6626ad39f9..47846d1c4f 100644
--- a/c/src/libnetworking/rtems/Makefile.am
+++ b/c/src/libnetworking/rtems/Makefile.am
@@ -4,6 +4,10 @@
 
 AUTOMAKE_OPTIONS = foreign 1.4
 
+
+
+include_rtemsdir = $(includedir)/rtems
+
 LIBNAME = lib.a
 LIB = $(ARCH)/$(LIBNAME)
 
@@ -15,12 +19,10 @@ C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.o)
 
 OBJS = $(C_O_FILES)
 
-H_FILES = rtems_bsdnet.h rtems_bsdnet_internal.h tftp.h
-
-noinst_HEADERS = $(H_FILES)
+include_rtems_HEADERS = rtems_bsdnet.h rtems_bsdnet_internal.h tftp.h
 
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems \
-    $(H_FILES:%=$(PROJECT_INCLUDE)/rtems/%)
+    $(include_rtems_HEADERS:%=$(PROJECT_INCLUDE)/rtems/%)
 
 $(PROJECT_INCLUDE)/rtems:
 	@$(mkinstalldirs) $@
diff --git a/c/src/libnetworking/rtems_servers/Makefile.am b/c/src/libnetworking/rtems_servers/Makefile.am
index b440fa69e2..bbba6e064c 100644
--- a/c/src/libnetworking/rtems_servers/Makefile.am
+++ b/c/src/libnetworking/rtems_servers/Makefile.am
@@ -4,6 +4,9 @@
 
 AUTOMAKE_OPTIONS = foreign 1.4
 
+
+
+
 LIBNAME = lib.a
 LIB = $(ARCH)/$(LIBNAME)
 
@@ -29,11 +32,9 @@ all-local: $(PREINSTALL_FILES) $(ARCH) $(OBJS) $(LIB)
 
 EXTRA_DIST = ftpd.c ftpd.h
 
-H_FILES = ftpd.h
-
-noinst_HEADERS = $(H_FILES)
+include_HEADERS = ftpd.h
 
-PREINSTALL_FILES += $(PROJECT_INCLUDE) $(H_FILES:%=$(PROJECT_INCLUDE)/%)
+PREINSTALL_FILES += $(PROJECT_INCLUDE) $(include_HEADERS:%=$(PROJECT_INCLUDE)/%)
 
 $(PROJECT_INCLUDE)/%.h: %.h
 	$(INSTALL_DATA) $< $@
diff --git a/c/src/libnetworking/rtems_webserver/Makefile.am b/c/src/libnetworking/rtems_webserver/Makefile.am
index 3870951683..1cbb77b00d 100644
--- a/c/src/libnetworking/rtems_webserver/Makefile.am
+++ b/c/src/libnetworking/rtems_webserver/Makefile.am
@@ -4,6 +4,8 @@
 
 AUTOMAKE_OPTIONS = foreign 1.4
 
+include_goaheaddir = $(includedir)/goahead
+
 LIBNAME = lib.a
 LIB = $(ARCH)/$(LIBNAME)
 
@@ -46,6 +48,9 @@ PREINSTALL_FILES += $(PROJECT_INCLUDE) $(PROJECT_INCLUDE)/rtems_webserver.h \
     $(PROJECT_INCLUDE)/goahead $(H_FILES:%.h=$(PROJECT_INCLUDE)/goahead/%.h)
 
 if HAS_POSIX
+include_HEADERS = rtems_webserver.h
+include_goahead_HEADERS = $(H_FILES)
+
 all-local: $(PREINSTALL_FILES) $(ARCH) $(OBJS) $(LIB)
 endif