diff --git a/mk/paths.mk b/mk/paths.mk index 13b1e81ae7acb12cf62079ee60ed6c165d0b61cb..5ced7ca5cf77ab2b447f5de5836cf7eff7441442 100644 --- a/mk/paths.mk +++ b/mk/paths.mk @@ -51,8 +51,8 @@ SRC_INSTALL_OPTS += $(INSTALL_OWNER) $(INSTALL_GROUP) # of targets: # -INSTALL_PROGRAM = $(INSTALL) -INSTALL_SCRIPT = $(INSTALL) +INSTALL_PROGRAM = $(INSTALL) -m 755 +INSTALL_SCRIPT = $(INSTALL) -m 755 INSTALL_DATA = $(INSTALL) -m 644 INSTALL_DIR = $(FPTOOLS_TOP)/glafp-utils/mkdirhier/mkdirhier @@ -167,7 +167,7 @@ MAINTAINER_CLEAN_FILES += .depend $(BOOT_SRCS) # `Standard' set of files to clean out. # MOSTLY_CLEAN_FILES += \ - *.CKP *.ln *.BAK *.bak *.o *core a.out errs ,* *.a .emacs_* \ + *.CKP *.ln *.BAK *.bak .*.bak *.o *core a.out errs ,* *.a .emacs_* \ tags TAGS *.ind *.ilg *.idx *.idx-prev *.aux *.aux-prev *.dvi *.log \ *.toc *.lot *.lof *.blg *.info *.itxi *.itex *.ihtml *.cb diff --git a/mk/target.mk b/mk/target.mk index ecc22132d9432e3aafe3fcde9f1d8c54426f8d4f..93469dc6f95c416f85dbb8a3866633bf6177ae15 100644 --- a/mk/target.mk +++ b/mk/target.mk @@ -548,18 +548,18 @@ ifneq "$(BIN_DIST)" "1" echo '$$'"libexecdir='$(libexecdir)';" >> $$i.tmp ; \ echo '$$'"datadir='$(datadir)';" >> $$i.tmp ; \ cat $$i >> $$i.tmp ; \ - echo $(INSTALL_PROGRAM) $(filter-out -s,$(INSTALL_BIN_OPTS)) $$i.tmp $(bindir)/$$i ; \ - $(INSTALL_PROGRAM) $(filter-out -s,$(INSTALL_BIN_OPTS)) $$i.tmp $(bindir)/$$i ; \ + echo $(INSTALL_SCRIPT) $(INSTALL_OPTS) $$i.tmp $(bindir)/$$i ; \ + $(INSTALL_SCRIPT) $(INSTALL_OPTS) $$i.tmp $(bindir)/$$i ; \ $(RM) $$i.tmp; \ done else for i in $(INSTALL_SCRIPTS); do \ - $(INSTALL_PROGRAM) $(INSTALL_OPTS) $$i $(bindir)/$$i; \ + $(INSTALL_SCRIPT) $(INSTALL_OPTS) $$i $(bindir)/$$i; \ done endif else for i in $(INSTALL_SCRIPTS); do \ - $(INSTALL_PROGRAM) $(INSTALL_OPTS) $$i $(bindir); \ + $(INSTALL_SCRIPT) $(INSTALL_OPTS) $$i $(bindir); \ done endif endif @@ -577,18 +577,18 @@ ifneq "$(BIN_DIST)" "1" echo '$$'"libexecdir='$(libexecdir)';" >> $$i.tmp ; \ echo '$$'"datadir='$(datadir)';" >> $$i.tmp ; \ cat $$i >> $$i.tmp ; \ - echo $(INSTALL_PROGRAM) $(INSTALL_OPTS) $$i $(libdir)/$$i ; \ - $(INSTALL_PROGRAM) $(INSTALL_OPTS) $$i.tmp $(libdir)/$$i ; \ + echo $(INSTALL_SCRIPT) $(INSTALL_OPTS) $$i $(libdir)/$$i ; \ + $(INSTALL_SCRIPT) $(INSTALL_OPTS) $$i.tmp $(libdir)/$$i ; \ $(RM) $$i.tmp; \ done else for i in $(INSTALL_LIB_SCRIPTS); do \ - $(INSTALL_PROGRAM) $(INSTALL_OPTS) $$i $(libdir)/$$i ; \ + $(INSTALL_SCRIPT) $(INSTALL_OPTS) $$i $(libdir)/$$i ; \ done endif else for i in $(INSTALL_LIB_SCRIPTS); do \ - $(INSTALL_PROGRAM) $(INSTALL_OPTS) $$i $(libdir); \ + $(INSTALL_SCRIPT) $(INSTALL_OPTS) $$i $(libdir); \ done endif endif @@ -606,18 +606,18 @@ ifneq "$(BIN_DIST)" "1" echo '$$'"libexecdir='$(libexecdir)';" >> $$i.tmp ; \ echo '$$'"datadir='$(datadir)';" >> $$i.tmp ; \ cat $$i >> $$i.tmp ; \ - echo $(INSTALL_PROGRAM) $(INSTALL_OPTS) $$i $(libexecdir) ; \ - $(INSTALL_PROGRAM) $(INSTALL_OPTS) $$i.tmp $(libexecdir)/$$i ; \ + echo $(INSTALL_SCRIPT) $(INSTALL_OPTS) $$i $(libexecdir) ; \ + $(INSTALL_SCRIPT) $(INSTALL_OPTS) $$i.tmp $(libexecdir)/$$i ; \ $(RM) $$i.tmp; \ done else for i in $(INSTALL_LIBEXEC_SCRIPTS); do \ - $(INSTALL_PROGRAM) $(INSTALL_OPTS) $$i $(libexecdir); \ + $(INSTALL_SCRIPT) $(INSTALL_OPTS) $$i $(libexecdir); \ done endif else for i in $(INSTALL_LIBEXEC_SCRIPTS); do \ - $(INSTALL_PROGRAM) $(INSTALL_OPTS) $$i $(libexecdir); \ + $(INSTALL_SCRIPT) $(INSTALL_OPTS) $$i $(libexecdir); \ done endif endif