Patch from Ralf Corsepius <corsepiu@faw.uni-ulm.de>:

This patch fixes a nasty problem with build-tools/Makefile.am:

    When using install-sh instead of /usr/bin/install, only the first file
    gets installed during the preinstall stage.
This commit is contained in:
Joel Sherrill
1999-06-02 16:34:54 +00:00
parent a5d697dc7d
commit 0e99ecfcea
4 changed files with 24 additions and 8 deletions

View File

@@ -26,8 +26,12 @@ noinst_SCRIPTS = search-id.sh
install-exec-local: $(bin_PROGRAMS) $(bin_SCRIPTS)
if test -n "${RTEMS_BSP}"; then \
$(mkinstalldirs) $(PROJECT_ROOT)/${RTEMS_BSP}/build-tools; \
$(INSTALL_SCRIPT) $(bin_SCRIPTS) $(PROJECT_ROOT)/${RTEMS_BSP}/build-tools; \
$(INSTALL_PROGRAM) $(bin_PROGRAMS) $(PROJECT_ROOT)/${RTEMS_BSP}/build-tools; \
for i in $(bin_SCRIPTS); do \
$(INSTALL_SCRIPT) $$i $(PROJECT_ROOT)/${RTEMS_BSP}/build-tools; \
done; \
for i in $(bin_PROGRAMS); do \
$(INSTALL_PROGRAM) $$i $(PROJECT_ROOT)/${RTEMS_BSP}/build-tools; \
done; \
fi
preinstall: install-exec-local

View File

@@ -469,8 +469,12 @@ maintainer-clean-generic clean mostlyclean distclean maintainer-clean
install-exec-local: $(bin_PROGRAMS) $(bin_SCRIPTS)
if test -n "${RTEMS_BSP}"; then \
$(mkinstalldirs) $(PROJECT_ROOT)/${RTEMS_BSP}/build-tools; \
$(INSTALL_SCRIPT) $(bin_SCRIPTS) $(PROJECT_ROOT)/${RTEMS_BSP}/build-tools; \
$(INSTALL_PROGRAM) $(bin_PROGRAMS) $(PROJECT_ROOT)/${RTEMS_BSP}/build-tools; \
for i in $(bin_SCRIPTS); do \
$(INSTALL_SCRIPT) $$i $(PROJECT_ROOT)/${RTEMS_BSP}/build-tools; \
done; \
for i in $(bin_PROGRAMS); do \
$(INSTALL_PROGRAM) $$i $(PROJECT_ROOT)/${RTEMS_BSP}/build-tools; \
done; \
fi
preinstall: install-exec-local

View File

@@ -26,8 +26,12 @@ noinst_SCRIPTS = search-id.sh
install-exec-local: $(bin_PROGRAMS) $(bin_SCRIPTS)
if test -n "${RTEMS_BSP}"; then \
$(mkinstalldirs) $(PROJECT_ROOT)/${RTEMS_BSP}/build-tools; \
$(INSTALL_SCRIPT) $(bin_SCRIPTS) $(PROJECT_ROOT)/${RTEMS_BSP}/build-tools; \
$(INSTALL_PROGRAM) $(bin_PROGRAMS) $(PROJECT_ROOT)/${RTEMS_BSP}/build-tools; \
for i in $(bin_SCRIPTS); do \
$(INSTALL_SCRIPT) $$i $(PROJECT_ROOT)/${RTEMS_BSP}/build-tools; \
done; \
for i in $(bin_PROGRAMS); do \
$(INSTALL_PROGRAM) $$i $(PROJECT_ROOT)/${RTEMS_BSP}/build-tools; \
done; \
fi
preinstall: install-exec-local

View File

@@ -469,8 +469,12 @@ maintainer-clean-generic clean mostlyclean distclean maintainer-clean
install-exec-local: $(bin_PROGRAMS) $(bin_SCRIPTS)
if test -n "${RTEMS_BSP}"; then \
$(mkinstalldirs) $(PROJECT_ROOT)/${RTEMS_BSP}/build-tools; \
$(INSTALL_SCRIPT) $(bin_SCRIPTS) $(PROJECT_ROOT)/${RTEMS_BSP}/build-tools; \
$(INSTALL_PROGRAM) $(bin_PROGRAMS) $(PROJECT_ROOT)/${RTEMS_BSP}/build-tools; \
for i in $(bin_SCRIPTS); do \
$(INSTALL_SCRIPT) $$i $(PROJECT_ROOT)/${RTEMS_BSP}/build-tools; \
done; \
for i in $(bin_PROGRAMS); do \
$(INSTALL_PROGRAM) $$i $(PROJECT_ROOT)/${RTEMS_BSP}/build-tools; \
done; \
fi
preinstall: install-exec-local