4 files changed, 46 insertions, 16 deletions
diff --git a/cpukit/libnetworking/net/Makefile.am b/cpukit/libnetworking/net/Makefile.am
index d965963974..eda18a9c76 100644
--- a/cpukit/libnetworking/net/Makefile.am
+++ b/cpukit/libnetworking/net/Makefile.am
@@ -1,6 +1,6 @@
-## 
+##
 ## $Id$
-## 
+##
 
 AUTOMAKE_OPTIONS = foreign 1.4
 
@@ -26,12 +26,24 @@ AM_CPPFLAGS += -D_COMPILING_BSD_KERNEL_ -DKERNEL -DINET -DNFS -DDIAGNOSTIC \
 $(LIB): $(OBJS)
 	$(make-library)
 
-all-local: $(ARCH) $(OBJS) $(LIB)
+all-local: $(PREINSTALL_FILES) $(ARCH) $(OBJS) $(LIB)
 
 .PRECIOUS: $(LIB)
 
-EXTRA_DIST = bpf.h ethernet.h if.c if.h if_arp.h if_dl.h if_ethersubr.c \
-    if_llc.h if_loop.c if_ppp.h if_types.h netisr.h ppp-comp.h ppp_defs.h \
-    radix.c radix.h raw_cb.c raw_cb.h raw_usrreq.c route.c route.h rtsock.c
+EXTRA_DIST = if.c if_ethersubr.c if_loop.c \
+    radix.c raw_cb.c raw_usrreq.c route.c rtsock.c
+
+H_FILES = bpf.h ethernet.h if.h if_arp.h if_dl.h if_llc.h if_ppp.h if_types.h \
+    netisr.h ppp-comp.h ppp_defs.h radix.h raw_cb.h route.h
+
+noinst_HEADERS = $(H_FILES)
+
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/net $(H_FILES:%=$(PROJECT_INCLUDE)/net/%)
+
+$(PROJECT_INCLUDE)/net:
+	@$(mkinstalldirs) $@
+
+$(PROJECT_INCLUDE)/net/%.h: %.h
+	$(INSTALL_DATA) $< $@
 
 include $(top_srcdir)/../../../automake/local.am
diff --git a/cpukit/libnetworking/net/if_loop.c b/cpukit/libnetworking/net/if_loop.c
index 3823c28744..345730c729 100644
--- a/cpukit/libnetworking/net/if_loop.c
+++ b/cpukit/libnetworking/net/if_loop.c
@@ -118,6 +118,7 @@ rtems_bsdnet_loopattach(dummy)
 	    ifp->if_type = IFT_LOOP;
 	    ifp->if_hdrlen = 0;
 	    ifp->if_addrlen = 0;
+	    ifp->if_snd.ifq_maxlen = ifqmaxlen;
 	    if_attach(ifp);
 #if NBPFILTER > 0
 	    bpfattach(ifp, DLT_NULL, sizeof(u_int));
diff --git a/cpukit/libnetworking/netinet/Makefile.am b/cpukit/libnetworking/netinet/Makefile.am
index f967b65cd7..dedeb31ac7 100644
--- a/cpukit/libnetworking/netinet/Makefile.am
+++ b/cpukit/libnetworking/netinet/Makefile.am
@@ -1,6 +1,6 @@
-## 
+##
 ## $Id$
-## 
+##
 
 AUTOMAKE_OPTIONS = foreign 1.4
 
@@ -28,16 +28,30 @@ AM_CPPFLAGS += -D_COMPILING_BSD_KERNEL_ -DKERNEL -DINET -DNFS -DDIAGNOSTIC \
 $(LIB): $(OBJS)
 	$(make-library)
 
-all-local: $(ARCH) $(OBJS) $(LIB)
+all-local: $(PREINSTALL_FILES) $(ARCH) $(OBJS) $(LIB)
 
 .PRECIOUS: $(LIB)
 
-EXTRA_DIST = icmp_var.h if_ether.c if_ether.h igmp.c igmp.h igmp_var.h in.c \
-    in.h in_cksum.c in_cksum_i386.c in_cksum_m68k.c in_cksum_powerpc.c \
-    in_pcb.c in_pcb.h in_proto.c in_rmx.c in_systm.h in_var.h ip.h \
-    ip_divert.c ip_fw.c ip_fw.h ip_icmp.c ip_icmp.h ip_input.c ip_mroute.c \
-    ip_mroute.h ip_output.c ip_var.h raw_ip.c tcp.h tcp_debug.c tcp_debug.h \
-    tcp_fsm.h tcp_input.c tcp_output.c tcp_seq.h tcp_subr.c tcp_timer.c \
-    tcp_timer.h tcp_usrreq.c tcp_var.h tcpip.h udp.h udp_usrreq.c udp_var.h
+EXTRA_DIST = if_ether.c igmp.c igmp_var.h in.c in_cksum.c in_cksum_i386.c \
+    in_cksum_m68k.c in_cksum_powerpc.c in_pcb.c in_proto.c in_rmx.c \
+    ip_divert.c ip_fw.c ip_icmp.c ip_input.c ip_mroute.c ip_output.c \
+    raw_ip.c tcp_debug.c tcp_input.c tcp_output.c tcp_subr.c tcp_timer.c \
+    tcp_usrreq.c udp_usrreq.c 
+
+H_FILES = icmp_var.h if_ether.h igmp.h igmp_var.h in.h \
+    in_pcb.h in_systm.h in_var.h ip.h ip_fw.h ip_icmp.h \
+    ip_mroute.h ip_var.h tcp.h tcp_debug.h tcp_fsm.h tcp_seq.h \
+    tcp_timer.h tcp_var.h tcpip.h udp.h udp_var.h
+
+noinst_HEADERS = $(H_FILES)
+
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/netinet \
+    $(H_FILES:%=$(PROJECT_INCLUDE)/netinet/%)
+
+$(PROJECT_INCLUDE)/netinet:
+	@$(mkinstalldirs) $@
+
+$(PROJECT_INCLUDE)/netinet/%.h: %.h
+	$(INSTALL_DATA) $< $@
 
 include $(top_srcdir)/../../../automake/local.am
diff --git a/cpukit/libnetworking/netinet/in.h b/cpukit/libnetworking/netinet/in.h
index ba3cbb21cc..36d2d4e867 100644
--- a/cpukit/libnetworking/netinet/in.h
+++ b/cpukit/libnetworking/netinet/in.h
@@ -255,6 +255,9 @@ struct in_addr {
 #define	INADDR_MAX_LOCAL_GROUP	(u_long)0xe00000ff	/* 224.0.0.255 */
 
 #define	IN_LOOPBACKNET		127			/* official! */
+#ifndef INADDR_LOOPBACK
+#define	INADDR_LOOPBACK		(u_long)0x7F000001	/* 127.0.0.1 */
+#endif
 
 /*
  * Socket address, internet style.