Commit f7fd588d authored by simonmar's avatar simonmar
Browse files

[project @ 1999-07-28 14:57:21 by simonmar]

- Use explicit file modes when installing binaries & scripts (not essential,
  but someone complained about it).

- Use $(INSTALL_SCRIPT) for scripts
parent 771f1acd
......@@ -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
......
......@@ -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
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment