[rtems-libbsd commit] Makefile: install all CPU specific contents correctly
Joel Sherrill
joel at rtems.org
Sat Jul 14 15:41:56 UTC 2012
Module: rtems-libbsd
Branch: master
Commit: 8c9c98db1144d04dd25d89e00bbfde3905fb638a
Changeset: http://git.rtems.org/rtems-libbsd/commit/?id=8c9c98db1144d04dd25d89e00bbfde3905fb638a
Author: Joel Sherrill <joel.sherrill at oarcorp.com>
Date: Fri Jul 13 13:03:10 2012 -0500
Makefile: install all CPU specific contents correctly
---
Makefile | 7 +++++--
freebsd-to-rtems.py | 7 +++++--
2 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/Makefile b/Makefile
index ee928cb..306203d 100644
--- a/Makefile
+++ b/Makefile
@@ -466,12 +466,15 @@ install: lib_bsd install_bsd lib_user install_user
install_bsd:
install -d $(INSTALL_BASE)/include
install -c -m 644 $(LIB) $(INSTALL_BASE)
- cd rtemsbsd; for i in `find . -name '*.h' | $(CPU_SED)` ; do \
+ cd rtemsbsd; for i in `find freebsd -name '*.h'` ; do \
install -c -m 644 -D "$$i" "$(INSTALL_BASE)/include/$$i" ; done
for i in `find freebsd -name '*.h' | $(CPU_SED)` ; do \
install -c -m 644 -D "$$i" "$(INSTALL_BASE)/include/$$i" ; done
- -cd freebsd/$(RTEMS_CPU)/include ; for i in `find . -name '*.h'` ; do \
+ -cd freebsd/$(RTEMS_CPU)/include && for i in `find . -name '*.h'` ; do \
install -c -m 644 -D "$$i" "$(INSTALL_BASE)/include/$$i" ; done
+ -cd rtemsbsd/$(RTEMS_CPU)/include && \
+ for i in `find . -name '*.h' | $(CPU_SED)` ; do \
+ install -c -m 644 -D "$$i" "$(INSTALL_BASE)/include/$$i" ; done
install_user:
$(MAKE) -C freebsd-userspace install
diff --git a/freebsd-to-rtems.py b/freebsd-to-rtems.py
index adc014a..4adfab4 100755
--- a/freebsd-to-rtems.py
+++ b/freebsd-to-rtems.py
@@ -385,12 +385,15 @@ class ModuleManager:
'install_bsd:\n' \
'\tinstall -d $(INSTALL_BASE)/include\n' \
'\tinstall -c -m 644 $(LIB) $(INSTALL_BASE)\n' \
- '\tcd rtemsbsd; for i in `find . -name \'*.h\' | $(CPU_SED)` ; do \\\n' \
+ '\tcd rtemsbsd; for i in `find freebsd -name \'*.h\'` ; do \\\n' \
'\t install -c -m 644 -D "$$i" "$(INSTALL_BASE)/include/$$i" ; done\n' \
'\tfor i in `find freebsd -name \'*.h\' | $(CPU_SED)` ; do \\\n' \
'\t install -c -m 644 -D "$$i" "$(INSTALL_BASE)/include/$$i" ; done\n' \
- '\t-cd freebsd/$(RTEMS_CPU)/include ; for i in `find . -name \'*.h\'` ; do \\\n' \
+ '\t-cd freebsd/$(RTEMS_CPU)/include && for i in `find . -name \'*.h\'` ; do \\\n' \
'\t install -c -m 644 -D "$$i" "$(INSTALL_BASE)/include/$$i" ; done\n' \
+ '\t-cd rtemsbsd/$(RTEMS_CPU)/include && \\\n' \
+ '\t for i in `find . -name \'*.h\' | $(CPU_SED)` ; do \\\n' \
+ '\t install -c -m 644 -D "$$i" "$(INSTALL_BASE)/include/$$i" ; done\n' \
'\n' \
'install_user:\n' \
'\t$(MAKE) -C freebsd-userspace install\n' \
More information about the vc
mailing list