diff options
| author | Jonathan Nieder <jrnieder@gmail.com> | 2013-11-11 12:45:29 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-11-11 14:14:06 -0800 |
| commit | c311741331058f4a3005569fb3f937b92e4521fb (patch) | |
| tree | 5f7e446375c72ba4653e7dd717d95ed39233815b /contrib/mw-to-git | |
| parent | 3176c59290de8921cd6649dfb59f4d1f1f2c31bf (diff) | |
| download | git-c311741331058f4a3005569fb3f937b92e4521fb.tar.gz git-c311741331058f4a3005569fb3f937b92e4521fb.tar.xz | |
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>
Diffstat (limited to 'contrib/mw-to-git')
| -rw-r--r-- | contrib/mw-to-git/Makefile | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/contrib/mw-to-git/Makefile b/contrib/mw-to-git/Makefile index c9acc843c..389a87eab 100644 --- a/contrib/mw-to-git/Makefile +++ b/contrib/mw-to-git/Makefile @@ -18,7 +18,9 @@ INSTLIBDIR=$(shell $(MAKE) -C $(GIT_ROOT_DIR)/perl \ all: build install_pm: - install $(GIT_MEDIAWIKI_PM) $(INSTLIBDIR)/$(GIT_MEDIAWIKI_PM) + install -d -m 755 $(DESTDIR)$(INSTLIBDIR)/Git + install -m 644 $(GIT_MEDIAWIKI_PM) \ + $(DESTDIR)$(INSTLIBDIR)/$(GIT_MEDIAWIKI_PM) build: $(MAKE) -C $(GIT_ROOT_DIR) SCRIPT_PERL=$(SCRIPT_PERL_FULL) \ |