mirror of
https://github.com/git/git
synced 2024-08-27 19:49:21 +00:00
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
This commit is contained in:
commit
968182a49d
|
@ -18,9 +18,13 @@ SCRIPT_PERL+=git-mw.perl
|
||||||
GIT_ROOT_DIR=../..
|
GIT_ROOT_DIR=../..
|
||||||
HERE=contrib/mw-to-git/
|
HERE=contrib/mw-to-git/
|
||||||
|
|
||||||
|
INSTALL = install
|
||||||
|
|
||||||
SCRIPT_PERL_FULL=$(patsubst %,$(HERE)/%,$(SCRIPT_PERL))
|
SCRIPT_PERL_FULL=$(patsubst %,$(HERE)/%,$(SCRIPT_PERL))
|
||||||
INSTLIBDIR=$(shell $(MAKE) -C $(GIT_ROOT_DIR)/perl \
|
INSTLIBDIR=$(shell $(MAKE) -C $(GIT_ROOT_DIR)/perl \
|
||||||
-s --no-print-directory instlibdir)
|
-s --no-print-directory instlibdir)
|
||||||
|
DESTDIR_SQ = $(subst ','\'',$(DESTDIR))
|
||||||
|
INSTLIBDIR_SQ = $(subst ','\'',$(INSTLIBDIR))
|
||||||
|
|
||||||
all: build
|
all: build
|
||||||
|
|
||||||
|
@ -30,7 +34,9 @@ test: all
|
||||||
check: perlcritic test
|
check: perlcritic test
|
||||||
|
|
||||||
install_pm:
|
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:
|
build:
|
||||||
$(MAKE) -C $(GIT_ROOT_DIR) SCRIPT_PERL="$(SCRIPT_PERL_FULL)" \
|
$(MAKE) -C $(GIT_ROOT_DIR) SCRIPT_PERL="$(SCRIPT_PERL_FULL)" \
|
||||||
|
@ -43,7 +49,6 @@ install: install_pm
|
||||||
clean:
|
clean:
|
||||||
$(MAKE) -C $(GIT_ROOT_DIR) SCRIPT_PERL="$(SCRIPT_PERL_FULL)" \
|
$(MAKE) -C $(GIT_ROOT_DIR) SCRIPT_PERL="$(SCRIPT_PERL_FULL)" \
|
||||||
clean-perl-script
|
clean-perl-script
|
||||||
rm $(INSTLIBDIR)/$(GIT_MEDIAWIKI_PM)
|
|
||||||
|
|
||||||
perlcritic:
|
perlcritic:
|
||||||
perlcritic -5 $(SCRIPT_PERL)
|
perlcritic -5 $(SCRIPT_PERL)
|
||||||
|
|
Loading…
Reference in a new issue