Remove leading rtems/ directory from paths under rtemsbsd

29 files changed, 9 insertions, 5 deletions

diff --git a/Makefile b/Makefile
index 4ca468b9..2de04023 100644
--- a/Makefile
+++ b/Makefile
@@ -6,8 +6,7 @@ include $(PROJECT_ROOT)/make/leaf.cfg
 
 CFLAGS += -ffreestanding 
 CFLAGS += -I . 
-# CFLAGS += -I rtemsbsd 
-CFLAGS += -I rtemsbsd/rtems
+CFLAGS += -I rtemsbsd 
 CFLAGS += -I contrib/altq 
 CFLAGS += -I contrib/pf 
 CFLAGS += -B $(INSTALL_BASE) 
@@ -350,8 +349,11 @@ lib_usb:
 	make $(LIB)
 
 install: $(LIB)
+	install -d "$(INSTALL_BASE)/include"
 	install -c -m 644 $(LIB) $(INSTALL_BASE)
-	for i in `find . -name '*.h'` ; do \
+	cd rtemsbsd; for i in `find . -name '*.h'` ; do \
+	  install -c -m 644 -D "$$i" "$(INSTALL_BASE)/include/$$i" ; done
+	for i in `find contrib freebsd -name '*.h'` ; do \
 	  install -c -m 644 -D "$$i" "$(INSTALL_BASE)/include/$$i" ; done
 
 clean:
diff --git a/freebsd-to-rtems.py b/freebsd-to-rtems.py
index cd33f655..6e3bce0c 100755
--- a/freebsd-to-rtems.py
+++ b/freebsd-to-rtems.py
@@ -297,7 +297,6 @@ class ModuleManager:
 			'CFLAGS += -ffreestanding \n' \
 			'CFLAGS += -I . \n' \
 			'CFLAGS += -I rtemsbsd \n' \
-			'CFLAGS += -I rtemsbsd/rtems \n' \
 			'CFLAGS += -I contrib/altq \n' \
 			'CFLAGS += -I contrib/pf \n' \
 			'CFLAGS += -B $(INSTALL_BASE) \n' \
@@ -328,8 +327,11 @@ class ModuleManager:
 			'\tmake $(LIB)\n' \
 			'\n' \
 			'install: $(LIB)\n' \
+            '\tinstall -d $(INSTALL_BASE)/include\n' \
             '\tinstall -c -m 644 $(LIB) $(INSTALL_BASE)\n' \
-            '\tfor i in `find . -name \'*.h\'` ; do \\\n' \
+            '\tcd rtemsbsd; for i in `find . -name \'*.h\'` ; do \\\n' \
+            '\t  install -c -m 644 -D "$$i" "$(INSTALL_BASE)/include/$$i" ; done\n' \
+            '\tfor i in `find contrib freebsd -name \'*.h\'` ; do \\\n' \
             '\t  install -c -m 644 -D "$$i" "$(INSTALL_BASE)/include/$$i" ; done\n' \
 			'\n' \
 			'clean:\n' \
diff --git a/rtemsbsd/rtems/freebsd/bsd.h b/rtemsbsd/freebsd/bsd.h
index 0d361c4c..0d361c4c 100644
--- a/rtemsbsd/rtems/freebsd/bsd.h
+++ b/rtemsbsd/freebsd/bsd.h
diff --git a/rtemsbsd/rtems/freebsd/machine/_align.h b/rtemsbsd/freebsd/machine/_align.h
index a307acaa..a307acaa 100644
--- a/rtemsbsd/rtems/freebsd/machine/_align.h
+++ b/rtemsbsd/freebsd/machine/_align.h
diff --git a/rtemsbsd/rtems/freebsd/machine/_bus.h b/rtemsbsd/freebsd/machine/_bus.h
index 436fb584..436fb584 100644
--- a/rtemsbsd/rtems/freebsd/machine/_bus.h
+++ b/rtemsbsd/freebsd/machine/_bus.h
diff --git a/rtemsbsd/rtems/freebsd/machine/_limits.h b/rtemsbsd/freebsd/machine/_limits.h
index 46cac302..46cac302 100644
--- a/rtemsbsd/rtems/freebsd/machine/_limits.h
+++ b/rtemsbsd/freebsd/machine/_limits.h
diff --git a/rtemsbsd/rtems/freebsd/machine/_stdint.h b/rtemsbsd/freebsd/machine/_stdint.h
index c41425f6..c41425f6 100644
--- a/rtemsbsd/rtems/freebsd/machine/_stdint.h
+++ b/rtemsbsd/freebsd/machine/_stdint.h
diff --git a/rtemsbsd/rtems/freebsd/machine/_types.h b/rtemsbsd/freebsd/machine/_types.h
index 0a1c80b0..0a1c80b0 100644
--- a/rtemsbsd/rtems/freebsd/machine/_types.h
+++ b/rtemsbsd/freebsd/machine/_types.h
diff --git a/rtemsbsd/rtems/freebsd/machine/atomic.h b/rtemsbsd/freebsd/machine/atomic.h
index 3e63ef2d..3e63ef2d 100644
--- a/rtemsbsd/rtems/freebsd/machine/atomic.h
+++ b/rtemsbsd/freebsd/machine/atomic.h
diff --git a/rtemsbsd/rtems/freebsd/machine/bus.h b/rtemsbsd/freebsd/machine/bus.h
index a2b21954..a2b21954 100644
--- a/rtemsbsd/rtems/freebsd/machine/bus.h
+++ b/rtemsbsd/freebsd/machine/bus.h
diff --git a/rtemsbsd/rtems/freebsd/machine/bus_dma.h b/rtemsbsd/freebsd/machine/bus_dma.h
index 44ed7762..44ed7762 100644
--- a/rtemsbsd/rtems/freebsd/machine/bus_dma.h
+++ b/rtemsbsd/freebsd/machine/bus_dma.h
diff --git a/rtemsbsd/rtems/freebsd/machine/clock.h b/rtemsbsd/freebsd/machine/clock.h
index 9f40d413..9f40d413 100644
--- a/rtemsbsd/rtems/freebsd/machine/clock.h
+++ b/rtemsbsd/freebsd/machine/clock.h
diff --git a/rtemsbsd/rtems/freebsd/machine/cpufunc.h b/rtemsbsd/freebsd/machine/cpufunc.h
index 08744991..08744991 100644
--- a/rtemsbsd/rtems/freebsd/machine/cpufunc.h
+++ b/rtemsbsd/freebsd/machine/cpufunc.h
diff --git a/rtemsbsd/rtems/freebsd/machine/endian.h b/rtemsbsd/freebsd/machine/endian.h
index 1b8128da..1b8128da 100644
--- a/rtemsbsd/rtems/freebsd/machine/endian.h
+++ b/rtemsbsd/freebsd/machine/endian.h
diff --git a/rtemsbsd/rtems/freebsd/machine/mutex.h b/rtemsbsd/freebsd/machine/mutex.h
index 8ab14405..8ab14405 100644
--- a/rtemsbsd/rtems/freebsd/machine/mutex.h
+++ b/rtemsbsd/freebsd/machine/mutex.h
diff --git a/rtemsbsd/rtems/freebsd/machine/param.h b/rtemsbsd/freebsd/machine/param.h
index c0472daf..c0472daf 100644
--- a/rtemsbsd/rtems/freebsd/machine/param.h
+++ b/rtemsbsd/freebsd/machine/param.h
diff --git a/rtemsbsd/rtems/freebsd/machine/pcpu.h b/rtemsbsd/freebsd/machine/pcpu.h
index caf1385f..caf1385f 100644
--- a/rtemsbsd/rtems/freebsd/machine/pcpu.h
+++ b/rtemsbsd/freebsd/machine/pcpu.h
diff --git a/rtemsbsd/rtems/freebsd/machine/proc.h b/rtemsbsd/freebsd/machine/proc.h
index 6873e087..6873e087 100644
--- a/rtemsbsd/rtems/freebsd/machine/proc.h
+++ b/rtemsbsd/freebsd/machine/proc.h
diff --git a/rtemsbsd/rtems/freebsd/machine/resource.h b/rtemsbsd/freebsd/machine/resource.h
index b29a0aca..b29a0aca 100644
--- a/rtemsbsd/rtems/freebsd/machine/resource.h
+++ b/rtemsbsd/freebsd/machine/resource.h
diff --git a/rtemsbsd/rtems/freebsd/machine/rtems-bsd-cache.h b/rtemsbsd/freebsd/machine/rtems-bsd-cache.h
index 77cc0794..77cc0794 100644
--- a/rtemsbsd/rtems/freebsd/machine/rtems-bsd-cache.h
+++ b/rtemsbsd/freebsd/machine/rtems-bsd-cache.h
diff --git a/rtemsbsd/rtems/freebsd/machine/rtems-bsd-config.h b/rtemsbsd/freebsd/machine/rtems-bsd-config.h
index b25d7ffe..b25d7ffe 100644
--- a/rtemsbsd/rtems/freebsd/machine/rtems-bsd-config.h
+++ b/rtemsbsd/freebsd/machine/rtems-bsd-config.h
diff --git a/rtemsbsd/rtems/freebsd/machine/rtems-bsd-select.h b/rtemsbsd/freebsd/machine/rtems-bsd-select.h
index 368c285b..368c285b 100644
--- a/rtemsbsd/rtems/freebsd/machine/rtems-bsd-select.h
+++ b/rtemsbsd/freebsd/machine/rtems-bsd-select.h
diff --git a/rtemsbsd/rtems/freebsd/machine/rtems-bsd-symbols.h b/rtemsbsd/freebsd/machine/rtems-bsd-symbols.h
index 9cf8da52..9cf8da52 100644
--- a/rtemsbsd/rtems/freebsd/machine/rtems-bsd-symbols.h
+++ b/rtemsbsd/freebsd/machine/rtems-bsd-symbols.h
diff --git a/rtemsbsd/rtems/freebsd/machine/rtems-bsd-sysinit.h b/rtemsbsd/freebsd/machine/rtems-bsd-sysinit.h
index a8d1fbb9..a8d1fbb9 100644
--- a/rtemsbsd/rtems/freebsd/machine/rtems-bsd-sysinit.h
+++ b/rtemsbsd/freebsd/machine/rtems-bsd-sysinit.h
diff --git a/rtemsbsd/rtems/freebsd/machine/runq.h b/rtemsbsd/freebsd/machine/runq.h
index affc070d..affc070d 100644
--- a/rtemsbsd/rtems/freebsd/machine/runq.h
+++ b/rtemsbsd/freebsd/machine/runq.h
diff --git a/rtemsbsd/rtems/freebsd/machine/signal.h b/rtemsbsd/freebsd/machine/signal.h
index 0e71cabb..0e71cabb 100644
--- a/rtemsbsd/rtems/freebsd/machine/signal.h
+++ b/rtemsbsd/freebsd/machine/signal.h
diff --git a/rtemsbsd/rtems/freebsd/machine/stdarg.h b/rtemsbsd/freebsd/machine/stdarg.h
index 7535272e..7535272e 100644
--- a/rtemsbsd/rtems/freebsd/machine/stdarg.h
+++ b/rtemsbsd/freebsd/machine/stdarg.h
diff --git a/rtemsbsd/rtems/freebsd/machine/ucontext.h b/rtemsbsd/freebsd/machine/ucontext.h
index 92d2b5d2..92d2b5d2 100644
--- a/rtemsbsd/rtems/freebsd/machine/ucontext.h
+++ b/rtemsbsd/freebsd/machine/ucontext.h
diff --git a/freebsd/local/pmap.h b/rtemsbsd/local/pmap.h
index f6d2924c..f6d2924c 100644
--- a/freebsd/local/pmap.h
+++ b/rtemsbsd/local/pmap.h