Fix install Makefile target

This commit is contained in:
Sebastian Huber 2013-12-20 15:34:57 +01:00
parent 00735284b8
commit f8d99e9665
3 changed files with 29 additions and 35 deletions

View File

@ -1310,24 +1310,21 @@ CPU_SED += -e '/powerpc/d'
CPU_SED += -e '/mips/d' CPU_SED += -e '/mips/d'
CPU_SED += -e '/sparc64/d' CPU_SED += -e '/sparc64/d'
LIB_DIR = $(INSTALL_BASE)/lib
INCLUDE_DIR = $(INSTALL_BASE)/lib/include
install: $(LIB) install: $(LIB)
install -d $(INSTALL_BASE)/include install -d $(LIB_DIR)
install -c -m 644 $(LIB) $(INSTALL_BASE) install -m 644 $(LIB) $(LIB_DIR)
cd rtemsbsd; for i in `find freebsd -name '*.h'` ; do \ cd rtemsbsd/include ; for i in `find . -type d` ; do \
install -c -m 644 -D "$$i" "$(INSTALL_BASE)/include/$$i" ; done install -d $(INCLUDE_DIR)/$$i ; \
cd contrib/altq; for i in `find freebsd -name '*.h'` ; do \ install -m 644 $$i/*.h $(INCLUDE_DIR)/$$i ; done
install -c -m 644 -D "$$i" "$(INSTALL_BASE)/include/$$i" ; done cd freebsd/include ; for i in `find . -type d` ; do \
cd contrib/pf; for i in `find freebsd -name '*.h'` ; do \ install -d $(INCLUDE_DIR)/$$i ; \
install -c -m 644 -D "$$i" "$(INSTALL_BASE)/include/$$i" ; done install -m 644 $$i/*.h $(INCLUDE_DIR)/$$i ; done
for i in `find freebsd -name '*.h' | $(CPU_SED)` ; do \ for i in bsm cam net net80211 netatalk netinet netinet6 netipsec sys ; do \
install -c -m 644 -D "$$i" "$(INSTALL_BASE)/include/$$i" ; done install -d $(INCLUDE_DIR)/$$i ; \
-cd freebsd/$(RTEMS_CPU)/include && for i in `find . -name '*.h'` ; do \ install -m 644 freebsd/sys/$$i/*.h $(INCLUDE_DIR)/$$i ; done
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
-cd copied/rtemsbsd/$(RTEMS_CPU)/include && for i in `find . -name '*.h'` ; do \
install -c -m 644 -D "$$i" "$(INSTALL_BASE)/include/$$i" ; done
clean: clean:
rm -f $(LIB_GEN_FILES) $(LIB) $(TESTS) $(O_FILES) $(D_FILES) rm -f $(LIB_GEN_FILES) $(LIB) $(TESTS) $(O_FILES) $(D_FILES)

View File

@ -4,7 +4,7 @@ BSP = realview_pbx_a9_qemu
PREFIX = /opt/rtems-4.11 PREFIX = /opt/rtems-4.11
# Optional: Separate installation base directory # Optional: Separate installation base directory
INSTALL_BASE = $(PREFIX) INSTALL_BASE = $(PREFIX)/$(TARGET)/$(BSP)
# Optional: Network test configuration # Optional: Network test configuration
TEST_RUNNER = $(BSP) TEST_RUNNER = $(BSP)

View File

@ -499,24 +499,21 @@ class ModuleManager:
'CPU_SED += -e \'/mips/d\'\n' \ 'CPU_SED += -e \'/mips/d\'\n' \
'CPU_SED += -e \'/sparc64/d\'\n' \ 'CPU_SED += -e \'/sparc64/d\'\n' \
'\n' \ '\n' \
'LIB_DIR = $(INSTALL_BASE)/lib\n' \
'INCLUDE_DIR = $(INSTALL_BASE)/lib/include\n' \
'\n' \
'install: $(LIB)\n' \ 'install: $(LIB)\n' \
'\tinstall -d $(INSTALL_BASE)/include\n' \ '\tinstall -d $(LIB_DIR)\n' \
'\tinstall -c -m 644 $(LIB) $(INSTALL_BASE)\n' \ '\tinstall -m 644 $(LIB) $(LIB_DIR)\n' \
'\tcd rtemsbsd; for i in `find freebsd -name \'*.h\'` ; do \\\n' \ '\tcd rtemsbsd/include ; for i in `find . -type d` ; do \\\n' \
'\t install -c -m 644 -D "$$i" "$(INSTALL_BASE)/include/$$i" ; done\n' \ '\t install -d $(INCLUDE_DIR)/$$i ; \\\n' \
'\tcd contrib/altq; for i in `find freebsd -name \'*.h\'` ; do \\\n' \ '\t install -m 644 $$i/*.h $(INCLUDE_DIR)/$$i ; done\n' \
'\t install -c -m 644 -D "$$i" "$(INSTALL_BASE)/include/$$i" ; done\n' \ '\tcd freebsd/include ; for i in `find . -type d` ; do \\\n' \
'\tcd contrib/pf; for i in `find freebsd -name \'*.h\'` ; do \\\n' \ '\t install -d $(INCLUDE_DIR)/$$i ; \\\n' \
'\t install -c -m 644 -D "$$i" "$(INSTALL_BASE)/include/$$i" ; done\n' \ '\t install -m 644 $$i/*.h $(INCLUDE_DIR)/$$i ; done\n' \
'\tfor i in `find freebsd -name \'*.h\' | $(CPU_SED)` ; do \\\n' \ '\tfor i in bsm cam net net80211 netatalk netinet netinet6 netipsec sys ; do \\\n' \
'\t install -c -m 644 -D "$$i" "$(INSTALL_BASE)/include/$$i" ; done\n' \ '\t install -d $(INCLUDE_DIR)/$$i ; \\\n' \
'\t-cd freebsd/$(RTEMS_CPU)/include && for i in `find . -name \'*.h\'` ; do \\\n' \ '\t install -m 644 freebsd/sys/$$i/*.h $(INCLUDE_DIR)/$$i ; done\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' \
'\t-cd copied/rtemsbsd/$(RTEMS_CPU)/include && for i in `find . -name \'*.h\'` ; do \\\n' \
'\t install -c -m 644 -D "$$i" "$(INSTALL_BASE)/include/$$i" ; done\n' \
'\n' \ '\n' \
'clean:\n' \ 'clean:\n' \
'\trm -f $(LIB_GEN_FILES) $(LIB) $(TESTS) $(O_FILES) $(D_FILES)\n' \ '\trm -f $(LIB_GEN_FILES) $(LIB) $(TESTS) $(O_FILES) $(D_FILES)\n' \