diff options
| author | Glenn Morris | 2017-12-18 20:08:31 -0500 |
|---|---|---|
| committer | Glenn Morris | 2017-12-18 20:08:31 -0500 |
| commit | 56274bc0bbfe144ef4af08fc86e9455dabfccf30 (patch) | |
| tree | 58219e0912e7c938dd9e7bd69e804a716e5f21af /Makefile.in | |
| parent | 066b65d03d4e6a1f666917fcea78998f3d001873 (diff) | |
| download | emacs-56274bc0bbfe144ef4af08fc86e9455dabfccf30.tar.gz emacs-56274bc0bbfe144ef4af08fc86e9455dabfccf30.zip | |
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: | |||
| 1155 | exit 1; \ | 1155 | exit 1; \ |
| 1156 | fi | 1156 | fi |
| 1157 | $(MAKE) -C lisp $@ | 1157 | $(MAKE) -C lisp $@ |
| 1158 | |||
| 1159 | .PHONY: gitmerge | ||
| 1160 | |||
| 1161 | GITMERGE_EMACS = ./src/emacs${EXEEXT} | ||
| 1162 | GITMERGE_NMIN = 10 | ||
| 1163 | |||
| 1164 | gitmerge: | ||
| 1165 | ${GITMERGE_EMACS} -batch --no-site-file --no-site-lisp \ | ||
| 1166 | -l ${srcdir}/admin/gitmerge.el \ | ||
| 1167 | --eval '(setq gitmerge-minimum-missing ${GITMERGE_NMIN})' -f gitmerge | ||