mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-11-21 06:55:39 +00:00
Code Issues Releases Activity

Add a Makefile rule for running gitmerge

Browse Source 
* Makefile.in (GITMERGE_EMACS, GITMERGE_NMIN): New variables.
(gitmerge): New phony target.
This commit is contained in:
Glenn Morris 2017-12-18 20:08:31 -05:00
parent 066b65d03d
commit 56274bc0bb
1 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Makefile.in
View File

@ -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