git-remote-mediawiki build: handle DESTDIR/INSTLIBDIR with whitespace

Quote DESTDIR and INSTLIBDIR for the shell in the same way as is done in
the toplevel Makefile to avoid confusion in case they contain shell
metacharacters.

Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Acked-by: Matthieu Moy <Matthieu.Moy@imag.fr>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/contrib/mw-to-git/Makefile b/contrib/mw-to-git/Makefile
index 36fa14c2b53c679f2fca74774f01078fabed5d23..37b68e2571e1e65968eab88c068aea3e6cbc22de 100644 (file)
--- a/contrib/mw-to-git/Makefile
+++ b/contrib/mw-to-git/Makefile
@@ -16,13 +16,15 @@ INSTALL = install
 SCRIPT_PERL_FULL=$(patsubst %,$(HERE)/%,$(SCRIPT_PERL))
 INSTLIBDIR=$(shell $(MAKE) -C $(GIT_ROOT_DIR)/perl \
                 -s --no-print-directory instlibdir)
 SCRIPT_PERL_FULL=$(patsubst %,$(HERE)/%,$(SCRIPT_PERL))
 INSTLIBDIR=$(shell $(MAKE) -C $(GIT_ROOT_DIR)/perl \
                 -s --no-print-directory instlibdir)

+DESTDIR_SQ = $(subst ','\'',$(DESTDIR))
+INSTLIBDIR_SQ = $(subst ','\'',$(INSTLIBDIR))

 
 all: build
 
 install_pm:
 
 all: build
 
 install_pm:

-       $(INSTALL) -d -m 755 $(DESTDIR)$(INSTLIBDIR)/Git
+       $(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(INSTLIBDIR_SQ)/Git'

        $(INSTALL) -m 644 $(GIT_MEDIAWIKI_PM) \
        $(INSTALL) -m 644 $(GIT_MEDIAWIKI_PM) \

-               $(DESTDIR)$(INSTLIBDIR)/$(GIT_MEDIAWIKI_PM)
+               '$(DESTDIR_SQ)$(INSTLIBDIR_SQ)/$(GIT_MEDIAWIKI_PM)'

 
 build:
        $(MAKE) -C $(GIT_ROOT_DIR) SCRIPT_PERL=$(SCRIPT_PERL_FULL) \
 
 build:
        $(MAKE) -C $(GIT_ROOT_DIR) SCRIPT_PERL=$(SCRIPT_PERL_FULL) \