From: Jonathan Nieder Date: Mon, 11 Nov 2013 20:46:12 +0000 (-0800) Subject: git-remote-mediawiki build: handle DESTDIR/INSTLIBDIR with whitespace X-Git-Tag: v1.9-rc0~90^2 X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/c635b050e7a8873f02d739b7a739a03ba4dd8606?ds=inline;hp=33f918c6752d543e00cbb0c554a13532b5d97366 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 Acked-by: Matthieu Moy Signed-off-by: Junio C Hamano --- diff --git a/contrib/mw-to-git/Makefile b/contrib/mw-to-git/Makefile index 36fa14c2b5..37b68e2571 100644 --- 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) +DESTDIR_SQ = $(subst ','\'',$(DESTDIR)) +INSTLIBDIR_SQ = $(subst ','\'',$(INSTLIBDIR)) 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) \ - $(DESTDIR)$(INSTLIBDIR)/$(GIT_MEDIAWIKI_PM) + '$(DESTDIR_SQ)$(INSTLIBDIR_SQ)/$(GIT_MEDIAWIKI_PM)' build: $(MAKE) -C $(GIT_ROOT_DIR) SCRIPT_PERL=$(SCRIPT_PERL_FULL) \