From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 5 Dec 2013 21:00:23 +0000 (-0800)
Subject: Merge branch 'jn/mediawiki-makefile-updates'
X-Git-Tag: v1.9-rc0~90
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/968182a49ddaeb76623f602d1674ed8e4efd1869?ds=inline;hp=-c

Merge branch 'jn/mediawiki-makefile-updates'

Build and installation procedure clean-up.

* jn/mediawiki-makefile-updates:
git-remote-mediawiki build: handle DESTDIR/INSTLIBDIR with whitespace
git-remote-mediawiki build: make 'install' command configurable
git-remote-mediawiki: honor DESTDIR in "make install"
git-remote-mediawiki: do not remove installed files in "clean" target
---

968182a49ddaeb76623f602d1674ed8e4efd1869
diff --combined contrib/mw-to-git/Makefile
index f206f9655b,37b68e2571..a4b6f7a2cd
--- a/contrib/mw-to-git/Makefile
+++ b/contrib/mw-to-git/Makefile
@@@ -2,51 -2,41 +2,56 @@@
  # Copyright (C) 2013
  #     Matthieu Moy <Matthieu.Moy@imag.fr>
  #
 +# To build and test:
 +#
 +#   make
 +#   bin-wrapper/git mw preview Some_page.mw
 +#   bin-wrapper/git clone mediawiki::http://example.com/wiki/
 +#
  # To install, run Git's toplevel 'make install' then run:
  #
  #   make install
  
  GIT_MEDIAWIKI_PM=Git/Mediawiki.pm
  SCRIPT_PERL=git-remote-mediawiki.perl
 +SCRIPT_PERL+=git-mw.perl
  GIT_ROOT_DIR=../..
  HERE=contrib/mw-to-git/
  
+ 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
  
 +test: all
 +	$(MAKE) -C t
 +
 +check: perlcritic test
 +
  install_pm:
- 	install $(GIT_MEDIAWIKI_PM) $(INSTLIBDIR)/$(GIT_MEDIAWIKI_PM)
+ 	$(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(INSTLIBDIR_SQ)/Git'
+ 	$(INSTALL) -m 644 $(GIT_MEDIAWIKI_PM) \
+ 		'$(DESTDIR_SQ)$(INSTLIBDIR_SQ)/$(GIT_MEDIAWIKI_PM)'
  
  build:
 -	$(MAKE) -C $(GIT_ROOT_DIR) SCRIPT_PERL=$(SCRIPT_PERL_FULL) \
 +	$(MAKE) -C $(GIT_ROOT_DIR) SCRIPT_PERL="$(SCRIPT_PERL_FULL)" \
                  build-perl-script
  
  install: install_pm
 -	$(MAKE) -C $(GIT_ROOT_DIR) SCRIPT_PERL=$(SCRIPT_PERL_FULL) \
 +	$(MAKE) -C $(GIT_ROOT_DIR) SCRIPT_PERL="$(SCRIPT_PERL_FULL)" \
                  install-perl-script
  
  clean:
 -	$(MAKE) -C $(GIT_ROOT_DIR) SCRIPT_PERL=$(SCRIPT_PERL_FULL) \
 +	$(MAKE) -C $(GIT_ROOT_DIR) SCRIPT_PERL="$(SCRIPT_PERL_FULL)" \
                  clean-perl-script
- 	rm $(INSTLIBDIR)/$(GIT_MEDIAWIKI_PM)
  
  perlcritic:
 -	perlcritic -2 *.perl
 +	perlcritic -5 $(SCRIPT_PERL)
 +	-perlcritic -2 $(SCRIPT_PERL)
 +
 +.PHONY: all test check install_pm install clean perlcritic