diff options
| author | Glenn Morris <rgm@gnu.org> | 2017-12-18 20:08:31 -0500 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2017-12-18 20:08:31 -0500 |
| commit | 56274bc0bbfe144ef4af08fc86e9455dabfccf30 (patch) | |
| tree | 58219e0912e7c938dd9e7bd69e804a716e5f21af /Makefile.in | |
| parent | 066b65d03d4e6a1f666917fcea78998f3d001873 (diff) | |
| download | emacs-56274bc0bbfe144ef4af08fc86e9455dabfccf30.tar.gz | |
Add a Makefile rule for running gitmerge
* Makefile.in (GITMERGE_EMACS, GITMERGE_NMIN): New variables.
(gitmerge): New phony target.
Diffstat (limited to 'Makefile.in')
| -rw-r--r-- | Makefile.in | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/Makefile.in b/Makefile.in index 3f46d0acafa..75a501a6608 100644 --- a/Makefile.in +++ b/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 |