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

diff --git a/contrib/mw-to-git/Makefile b/contrib/mw-to-git/Makefile
index 389a87eab12278481de2a6f336245b52bfca1f03..37b68e2571e1e65968eab88c068aea3e6cbc22de 100644 (file)
--- a/contrib/mw-to-git/Makefile
+++ b/contrib/mw-to-git/Makefile
@@ -11,16 +11,20 @@ SCRIPT_PERL=git-remote-mediawiki.perl
 GIT_ROOT_DIR=../..
 HERE=contrib/mw-to-git/
 
+INSTALL = install
+
 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:
-       install -d -m 755 $(DESTDIR)$(INSTLIBDIR)/Git
-       install -m 644 $(GIT_MEDIAWIKI_PM) \
-               $(DESTDIR)$(INSTLIBDIR)/$(GIT_MEDIAWIKI_PM)
+       $(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(INSTLIBDIR_SQ)/Git'
+       $(INSTALL) -m 644 $(GIT_MEDIAWIKI_PM) \
+               '$(DESTDIR_SQ)$(INSTLIBDIR_SQ)/$(GIT_MEDIAWIKI_PM)'
 
 build:
        $(MAKE) -C $(GIT_ROOT_DIR) SCRIPT_PERL=$(SCRIPT_PERL_FULL) \