Add a Makefile rule for running gitmerge
* Makefile.in (GITMERGE_EMACS, GITMERGE_NMIN): New variables. (gitmerge): New phony target.
This commit is contained in:
parent
066b65d03d
commit
56274bc0bb
1 changed files with 10 additions and 0 deletions
10
Makefile.in
10
Makefile.in
|
@ -1155,3 +1155,13 @@ check-declare:
|
|||
exit 1; \
|
||||
fi
|
||||
$(MAKE) -C lisp $@
|
||||
|
||||
.PHONY: gitmerge
|
||||
|
||||
GITMERGE_EMACS = ./src/emacs${EXEEXT}
|
||||
GITMERGE_NMIN = 10
|
||||
|
||||
gitmerge:
|
||||
${GITMERGE_EMACS} -batch --no-site-file --no-site-lisp \
|
||||
-l ${srcdir}/admin/gitmerge.el \
|
||||
--eval '(setq gitmerge-minimum-missing ${GITMERGE_NMIN})' -f gitmerge
|
||||
|
|
Loading…
Add table
Reference in a new issue