aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPhilipp Stephani2018-09-20 14:03:29 +0200
committerEli Zaretskii2018-10-16 18:43:18 +0300
commit1dce1b2ffb67907afff2cac62bb05361dac815e4 (patch)
tree897bc13b47792fc19aad2b001d5bcb4ee8b134fb
parent73babba26aa714c34aa8d9473ba5b55ce110a215 (diff)
downloademacs-1dce1b2ffb67907afff2cac62bb05361dac815e4.tar.gz
emacs-1dce1b2ffb67907afff2cac62bb05361dac815e4.zip
Install emacs-module.h (Bug#31929)
* Makefile.in (includedir): New variable. (install-arch-indep): Install emacs-module.h. (uninstall): Uninstall emacs-module.h. (cherry picked from commit 00ea749f2af44bff6ea8c1259477fbf0ead8a306)
-rw-r--r--Makefile.in6
1 files changed, 6 insertions, 0 deletions
diff --git a/Makefile.in b/Makefile.in
index 19bf7c423ff..77498181650 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -151,6 +151,9 @@ libexecdir=@libexecdir@
151# Currently only used for the systemd service file. 151# Currently only used for the systemd service file.
152libdir=@libdir@ 152libdir=@libdir@
153 153
154# Where to install emacs-module.h.
155includedir=@includedir@
156
154# Where to install Emacs's man pages. 157# Where to install Emacs's man pages.
155# Note they contain cross-references that expect them to be in section 1. 158# Note they contain cross-references that expect them to be in section 1.
156mandir=@mandir@ 159mandir=@mandir@
@@ -558,6 +561,8 @@ set_installuser=for installuser in $${LOGNAME} $${USERNAME} $${USER} \
558## See also these comments from 2004 about cp -r working fine: 561## See also these comments from 2004 about cp -r working fine:
559## https://lists.gnu.org/r/autoconf-patches/2004-11/msg00005.html 562## https://lists.gnu.org/r/autoconf-patches/2004-11/msg00005.html
560install-arch-indep: lisp install-info install-man ${INSTALL_ARCH_INDEP_EXTRA} 563install-arch-indep: lisp install-info install-man ${INSTALL_ARCH_INDEP_EXTRA}
564 umask 022 && $(MKDIR_P) -m 0755 $(includedir)
565 $(INSTALL_DATA) src/emacs-module.h $(includedir)/emacs-module.h
561 -set ${COPYDESTS} ; \ 566 -set ${COPYDESTS} ; \
562 unset CDPATH; \ 567 unset CDPATH; \
563 $(set_installuser); \ 568 $(set_installuser); \
@@ -741,6 +746,7 @@ install-strip:
741### 746###
742### Don't delete the lisp and etc directories if they're in the source tree. 747### Don't delete the lisp and etc directories if they're in the source tree.
743uninstall: uninstall-$(NTDIR) uninstall-doc 748uninstall: uninstall-$(NTDIR) uninstall-doc
749 rm -f $(includedir)/emacs-module.h
744 $(MAKE) -C lib-src uninstall 750 $(MAKE) -C lib-src uninstall
745 -unset CDPATH; \ 751 -unset CDPATH; \
746 for dir in "$(DESTDIR)${lispdir}" "$(DESTDIR)${etcdir}" ; do \ 752 for dir in "$(DESTDIR)${lispdir}" "$(DESTDIR)${etcdir}" ; do \