summaryrefslogtreecommitdiff
path: root/contrib/mw-to-git
diff options
context:
space:
mode:
authorJonathan Nieder <jrnieder@gmail.com>2013-11-11 20:46:12 (GMT)
committerJunio C Hamano <gitster@pobox.com>2013-11-11 22:14:07 (GMT)
commitc635b050e7a8873f02d739b7a739a03ba4dd8606 (patch)
tree3f5f3c63d55eb954b5de9466f8b20054a141c29e /contrib/mw-to-git
parent33f918c6752d543e00cbb0c554a13532b5d97366 (diff)
downloadgit-c635b050e7a8873f02d739b7a739a03ba4dd8606.zip
git-c635b050e7a8873f02d739b7a739a03ba4dd8606.tar.gz
git-c635b050e7a8873f02d739b7a739a03ba4dd8606.tar.bz2
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>
Diffstat (limited to 'contrib/mw-to-git')
-rw-r--r--contrib/mw-to-git/Makefile6
1 files changed, 4 insertions, 2 deletions
diff --git a/contrib/mw-to-git/Makefile b/contrib/mw-to-git/Makefile
index 36fa14c..37b68e2 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) \