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://granicus.if.org/sourcecode?a=commitdiff_plain;h=968182a49ddaeb76623f602d1674ed8e4efd1869;p=git

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 --cc contrib/mw-to-git/Makefile
index f206f9655b,37b68e2571..a4b6f7a2cd
--- a/contrib/mw-to-git/Makefile
+++ b/contrib/mw-to-git/Makefile
@@@ -24,16 -21,13 +28,18 @@@ INSTLIBDIR_SQ = $(subst ','\'',$(INSTLI
  
  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
@@@ -41,12 -35,8 +47,11 @@@
                  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