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>
Jonathan Nieder committed
Nov 11, 2013 at 12:46 UTC
c635b050e7a8873f02d739b7a739a03ba4dd8606
1 file changed
+4
-2
contrib/mw-to-git/Makefile
+4
-2
@@ -16,13 +16,15 @@ INSTALL = install
16
SCRIPT_PERL_FULL=$(patsubst %,$(HERE)/%,$(SCRIPT_PERL))
17
INSTLIBDIR=$(shell $(MAKE) -C $(GIT_ROOT_DIR)/perl \
18
-s --no-print-directory instlibdir)
19
+DESTDIR_SQ = $(subst ','\'',$(DESTDIR))
20
+INSTLIBDIR_SQ = $(subst ','\'',$(INSTLIBDIR))
21
22
all: build
23
24
install_pm:
23
- $(INSTALL) -d -m 755 $(DESTDIR)$(INSTLIBDIR)/Git
25
+ $(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(INSTLIBDIR_SQ)/Git'
26
$(INSTALL) -m 644 $(GIT_MEDIAWIKI_PM) \
25
- $(DESTDIR)$(INSTLIBDIR)/$(GIT_MEDIAWIKI_PM)
27
+ '$(DESTDIR_SQ)$(INSTLIBDIR_SQ)/$(GIT_MEDIAWIKI_PM)'
28
29
build:
30
$(MAKE) -C $(GIT_ROOT_DIR) SCRIPT_PERL=$(SCRIPT_PERL_FULL) \