@matheusbsbs / matheus-bagliano / commits / c311741331

git-remote-mediawiki: honor DESTDIR in "make install"

So now you can run DESTDIR=$(pwd)/tmp make -Ccontrib/mw-to-git install to install the mediawiki remote helper, git-mw tool, and Git::Mediawiki perl module under tmp/ as preparation for zipping it up and extracting on another machine. While at it, make sure the directory that should contain Git::Mediawiki exists before putting a file there. Without this patch, the makefile uses DESTDIR when installing git-mw and git-remote-mediawiki but not the perl module, resulting in errors from "make install" if the $(INSTLIBDIR)/Git directory does not exist: install: cannot create regular file \ '/usr/share/perl/5.18.1/Git/Mediawiki.pm': No such file or directory 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:45 UTC c311741331058f4a3005569fb3f937b92e4521fb

1 file changed +3 -1

contrib/mw-to-git/Makefile

+3 -1

@@ -18,7 +18,9 @@ INSTLIBDIR=$(shell $(MAKE) -C $(GIT_ROOT_DIR)/perl \

18 all: build

20 install_pm:

21 - install $(GIT_MEDIAWIKI_PM) $(INSTLIBDIR)/$(GIT_MEDIAWIKI_PM)

21 + install -d -m 755 $(DESTDIR)$(INSTLIBDIR)/Git

22 + install -m 644 $(GIT_MEDIAWIKI_PM) \

23 + $(DESTDIR)$(INSTLIBDIR)/$(GIT_MEDIAWIKI_PM)

25 build:

26 $(MAKE) -C $(GIT_ROOT_DIR) SCRIPT_PERL=$(SCRIPT_PERL_FULL) \