install-sh from automake does not like -m without delimiting space

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 <rschiele@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/Documentation/Makefile b/Documentation/Makefile
index de11ee01927f032c65b0a3516393c4eadf636718..16ee0d39724578b947dee8e1afee6c828e8ed591 100644 (file)
--- a/Documentation/Makefile
+++ b/Documentation/Makefile
@@ -79,16 +79,16 @@ man7: $(DOC_MAN7)
 info: git.info
 
 install: man
 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-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 \
        if test -r $(DESTDIR)$(infodir)/dir; then \
          $(INSTALL_INFO) --info-dir=$(DESTDIR)$(infodir) git.info ;\
        else \

diff --git a/Makefile b/Makefile
index 4b418bf76ed6cbbeb0340eda07cd733570761f8f..ed0c5d113c4e169aa1342b32b8cd87a798559daf 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1017,8 +1017,8 @@ remove-dashes:
 ### Installation rules
 
 install: all
 ### 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
        $(INSTALL) $(ALL_PROGRAMS) '$(DESTDIR_SQ)$(gitexecdir_SQ)'
        $(INSTALL) git$X '$(DESTDIR_SQ)$(bindir_SQ)'
        $(MAKE) -C templates DESTDIR='$(DESTDIR_SQ)' install

diff --git a/templates/Makefile b/templates/Makefile
index 6f4dbd362fffdd85570c2223ad7d98015e7970ae..ebd3a62fd866453ad77406ec063b923e99ee0990 100644 (file)
--- a/templates/Makefile
+++ b/templates/Makefile
@@ -46,6 +46,6 @@ clean:
        $(RM) -r blt boilerplates.made
 
 install: all
        $(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 -)
        (cd blt && $(TAR) cf - .) | \
        (cd '$(DESTDIR_SQ)$(template_dir_SQ)' && $(TAR) xf -)