diff options
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/build/os/msdos/Makefile.in | 3 | ||||
| -rw-r--r-- | tools/build/scripts/Makefile.in | 3 | ||||
| -rw-r--r-- | tools/build/src/Makefile.in | 10 | ||||
| -rw-r--r-- | tools/cpu/generic/Makefile.in | 5 | ||||
| -rw-r--r-- | tools/cpu/unix/Makefile.in | 2 | ||||
| -rw-r--r-- | tools/update/Makefile.in | 8 |
6 files changed, 17 insertions, 14 deletions
diff --git a/tools/build/os/msdos/Makefile.in b/tools/build/os/msdos/Makefile.in index 4a060f7c37..7321a3a2ea 100644 --- a/tools/build/os/msdos/Makefile.in +++ b/tools/build/os/msdos/Makefile.in @@ -18,10 +18,9 @@ INSTALLED=$(DESTDIR)/ifc.exe \ $(DESTDIR)/fixtimer.exe all: $(DESTDIR) $(PGMS) install - echo $(DESTDIR) $(DESTDIR): - [ -d $@ ] || $(MKDIR) $@ + $(BSDINSTALL) $(INSTDIRFLAGS) $@ install: $(INSTALLED) diff --git a/tools/build/scripts/Makefile.in b/tools/build/scripts/Makefile.in index 1cecfcc2cb..2634d61562 100644 --- a/tools/build/scripts/Makefile.in +++ b/tools/build/scripts/Makefile.in @@ -23,10 +23,9 @@ PGMS=install-if-change rcs-clean lock-directory unlock-directory \ INSTALLED=$(PGMS:%=$(DESTDIR)/%) all: $(DESTDIR) $(PGMS) install - echo $(DESTDIR) $(DESTDIR): - [ -d $@ ] || $(MKDIR) $@ + $(BSDINSTALL) $(INSTDIRFLAGS) $@ install: $(INSTALLED) diff --git a/tools/build/src/Makefile.in b/tools/build/src/Makefile.in index d1cfe1a519..4ba4dfd4a2 100644 --- a/tools/build/src/Makefile.in +++ b/tools/build/src/Makefile.in @@ -32,6 +32,7 @@ H_FILES= SRCS=$(C_FILES) $(CC_FILES) $(H_FILES) OBJS=$(C_O_FILES) $(CC_O_FILES) $(S_O_FILES) +# FIXME: building into $(ARCH) doesn't make sense for host programs PGMS=$(ARCH)/cklength$(EXEEXT) $(ARCH)/eolstrip$(EXEEXT) \ $(ARCH)/packhex$(EXEEXT) $(ARCH)/unhex$(EXEEXT) @@ -60,5 +61,10 @@ LDFLAGS += CLEAN_ADDITIONS += $(HOST_ARCH) CLOBBER_ADDITIONS += -all: $(ARCH) $(SRCS) $(PGMS) - $(INSTALL) -m 555 $(PGMS) ${PROJECT_RELEASE}/build-tools +DESTDIR=${PROJECT_RELEASE}/build-tools + +$(DESTDIR): + $(BSDINSTALL) $(INSTDIRFLAGS) $@ + +all: $(ARCH) $(DESTDIR) $(SRCS) $(PGMS) + $(BSDINSTALL) $(INSTBINFLAGS) $(PGMS) $(DESTDIR) diff --git a/tools/cpu/generic/Makefile.in b/tools/cpu/generic/Makefile.in index 419b20b96c..e5fdec7d7f 100644 --- a/tools/cpu/generic/Makefile.in +++ b/tools/cpu/generic/Makefile.in @@ -22,13 +22,12 @@ PGMS=size_rtems INSTALLED=$(PGMS:%=$(DESTDIR)/%) all: $(DESTDIR) $(PGMS) install - echo $(DESTDIR) $(DESTDIR): - [ -d $@ ] || $(MKDIR) $@ + $(BSDINSTALL) $(INSTDIRFLAGS) $@ install: $(INSTALLED) # Install the program $(DESTDIR)/%: % - $(make-script) + $(BSDINSTALL) $(INSTBINFLAGS) $^ $@ diff --git a/tools/cpu/unix/Makefile.in b/tools/cpu/unix/Makefile.in index 6041f15730..f49c25c734 100644 --- a/tools/cpu/unix/Makefile.in +++ b/tools/cpu/unix/Makefile.in @@ -50,7 +50,7 @@ CLEAN_ADDITIONS += CLOBBER_ADDITIONS += all: ${ARCH} $(SRCS) $(PGMS) - $(INSTALL) -m 555 ${PGMS} ${PROJECT_RELEASE}/bin + $(BSDINSTALL) $(INSTBINFLAGS) ${PGMS} ${PROJECT_RELEASE}/bin preinstall: diff --git a/tools/update/Makefile.in b/tools/update/Makefile.in index 025930cdd2..e558bd4b37 100644 --- a/tools/update/Makefile.in +++ b/tools/update/Makefile.in @@ -24,15 +24,15 @@ INSTALL_LIST= $(PGMS) $(MISC_SUPPORT) INSTALLED=$(INSTALL_LIST:%=$(DESTDIR)/%) all: $(DESTDIR) - echo $(DESTDIR) $(DESTDIR): - [ -d $@ ] || $(MKDIR) $@ + $(BSDINSTALL) $(INSTDIRFLAGS) $@ install: $(INSTALLED) # Install the program +# FIXME: This isn't correct $(DESTDIR)/%: % $(make-script) - $(INSTALL) -m 555 $(PERL_PGMS) ${DESTDIR} - $(INSTALL) -m 444 $(srcdir)/$(MISC_SUPPORT) ${DESTDIR} + $(BSDINSTALL) $(INSTBINFLAGS) $(PERL_PGMS) ${DESTDIR} + $(BSDINSTALL) $(INSTDATAFLAGS) $(MISC_SUPPORT) ${DESTDIR} |