# [PATCH] install-sh from automake does not like -m without delimiting space 3 messages from 2007-12-01 to 2007-12-04. Participants: Robert Schiele, Junio C Hamano, Shawn O. Pearce. Thread: https://gitlist.dev/t/11080 ## Robert Schiele, 2007-12-01 17:05 Subject: [PATCH] install-sh from automake does not like -m without delimiting space Message-ID: <20071201170540.GS11347@schiele.dyndns.org> URL: https://gitlist.dev/e/20071201170540.GS11347%40schiele.dyndns.org ``` The install-sh script as shipped with automake requires a space between the -m switch and its argument. Since this is also the regular way of doing it with other install implementations this change inserts the missing space in all makefiles. Signed-off-by: Robert Schiele --- Documentation/Makefile | 16 ++++++++-------- Makefile | 4 ++-- git-gui/Makefile | 12 ++++++------ templates/Makefile | 2 +- 4 files changed, 17 insertions(+), 17 deletions(-) diff --git a/Documentation/Makefile b/Documentation/Makefile index d886641..2de4b8b 100644 --- a/Documentation/Makefile +++ b/Documentation/Makefile @@ -79,16 +79,16 @@ man7: $(DOC_MAN7) info: git.info install: man - $(INSTALL) -d -m755 $(DESTDIR)$(man1dir) - $(INSTALL) -d -m755 $(DESTDIR)$(man5dir) - $(INSTALL) -d -m755 $(DESTDIR)$(man7dir) - $(INSTALL) -m644 $(DOC_MAN1) $(DESTDIR)$(man1dir) - $(INSTALL) -m644 $(DOC_MAN5) $(DESTDIR)$(man5dir) - $(INSTALL) -m644 $(DOC_MAN7) $(DESTDIR)$(man7dir) + $(INSTALL) -d -m 755 $(DESTDIR)$(man1dir) + $(INSTALL) -d -m 755 $(DESTDIR)$(man5dir) + $(INSTALL) -d -m 755 $(DESTDIR)$(man7dir) + $(INSTALL) -m 644 $(DOC_MAN1) $(DESTDIR)$(man1dir) + $(INSTALL) -m 644 $(DOC_MAN5) $(DESTDIR)$(man5dir) + $(INSTALL) -m 644 $(DOC_MAN7) $(DESTDIR)$(man7dir) install-info: info - $(INSTALL) -d -m755 $(DESTDIR)$(infodir) - $(INSTALL) -m644 git.info $(DESTDIR)$(infodir) + $(INSTALL) -d -m 755 $(DESTDIR)$(infodir) + $(INSTALL) -m 644 git.info $(DESTDIR)$(infodir) if test -r $(DESTDIR)$(infodir)/dir; then \ $(INSTALL_INFO) --info-dir=$(DESTDIR)$(infodir) git.info ;\ else \ diff --git a/Makefile b/Makefile index e869b85..7d23aec 100644 --- a/Makefile +++ b/Makefile @@ -1024,8 +1024,8 @@ remove-dashes: ### Installation rules install: all - $(INSTALL) -d -m755 '$(DESTDIR_SQ)$(bindir_SQ)' - $(INSTALL) -d -m755 '$(DESTDIR_SQ)$(gitexecdir_SQ)' + $(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(bindir_SQ)' + $(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(gitexecdir_SQ)' $(INSTALL) $(ALL_PROGRAMS) '$(DESTDIR_SQ)$(gitexecdir_SQ)' $(INSTALL) git$X '$(DESTDIR_SQ)$(bindir_SQ)' $(MAKE) -C templates DESTDIR='$(DESTDIR_SQ)' install diff --git a/git-gui/Makefile b/git-gui/Makefile index e860319..4f8b7c8 100644 --- a/git-gui/Makefile +++ b/git-gui/Makefile @@ -43,11 +43,11 @@ endif RM_RF ?= rm -rf RMDIR ?= rmdir -INSTALL_D0 = $(INSTALL) -d -m755 # space is required here +INSTALL_D0 = $(INSTALL) -d -m 755 # space is required here INSTALL_D1 = -INSTALL_R0 = $(INSTALL) -m644 # space is required here +INSTALL_R0 = $(INSTALL) -m 644 # space is required here INSTALL_R1 = -INSTALL_X0 = $(INSTALL) -m755 # space is required here +INSTALL_X0 = $(INSTALL) -m 755 # space is required here INSTALL_X1 = INSTALL_A0 = find # space is required here INSTALL_A1 = | cpio -pud @@ -71,11 +71,11 @@ ifndef V QUIET_2DEVNULL = 2>/dev/null INSTALL_D0 = dir= - INSTALL_D1 = && echo ' ' DEST $$dir && $(INSTALL) -d -m755 "$$dir" + INSTALL_D1 = && echo ' ' DEST $$dir && $(INSTALL) -d -m 755 "$$dir" INSTALL_R0 = src= - INSTALL_R1 = && echo ' ' INSTALL 644 `basename $$src` && $(INSTALL) -m644 $$src + INSTALL_R1 = && echo ' ' INSTALL 644 `basename $$src` && $(INSTALL) -m 644 $$src INSTALL_X0 = src= - INSTALL_X1 = && echo ' ' INSTALL 755 `basename $$src` && $(INSTALL) -m755 $$src + INSTALL_X1 = && echo ' ' INSTALL 755 `basename $$src` && $(INSTALL) -m 755 $$src INSTALL_A0 = src= INSTALL_A1 = && echo ' ' INSTALL ' ' `basename "$$src"` && find "$$src" | cpio -pud diff --git a/templates/Makefile b/templates/Makefile index 6f4dbd3..ebd3a62 100644 --- a/templates/Makefile +++ b/templates/Makefile @@ -46,6 +46,6 @@ clean: $(RM) -r blt boilerplates.made install: all - $(INSTALL) -d -m755 '$(DESTDIR_SQ)$(template_dir_SQ)' + $(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(template_dir_SQ)' (cd blt && $(TAR) cf - .) | \ (cd '$(DESTDIR_SQ)$(template_dir_SQ)' && $(TAR) xf -) -- 1.5.2.4 ``` ## Junio C Hamano, 2007-12-04 01:02 Subject: Re: [PATCH] install-sh from automake does not like -m without delimiting space Message-ID: <7v1wa3e0h9.fsf@gitster.siamese.dyndns.org> URL: https://gitlist.dev/e/7v1wa3e0h9.fsf%40gitster.siamese.dyndns.org In-Reply-To: <20071201170540.GS11347@schiele.dyndns.org> ``` Robert Schiele writes: > The install-sh script as shipped with automake requires a space between > the -m switch and its argument. Since this is also the regular way of > doing it with other install implementations this change inserts the > missing space in all makefiles. I do not think this is risky, so I'll take it but please yell if it breaks some existing setups. I'll ask Shawn to do that part separately. Thanks. ``` ## Shawn O. Pearce, 2007-12-04 01:48 Subject: Re: [PATCH] install-sh from automake does not like -m without delimiting space Message-ID: <20071204014855.GU14735@spearce.org> URL: https://gitlist.dev/e/20071204014855.GU14735%40spearce.org In-Reply-To: <7v1wa3e0h9.fsf@gitster.siamese.dyndns.org> ``` Junio C Hamano wrote: > Robert Schiele writes: > > The install-sh script as shipped with automake requires a space between > > the -m switch and its argument. Since this is also the regular way of > > doing it with other install implementations this change inserts the > > missing space in all makefiles. ... > I'll ask Shawn to do that part separately. The git-gui portion is already in my master branch. See the "What's in git-gui.git" I sent out last evening. -- Shawn. ```