diff options
| author | Glenn Morris <rgm@gnu.org> | 2018-10-03 16:47:01 -0400 |
|---|---|---|
| committer | Eli Zaretskii <eliz@gnu.org> | 2018-10-16 18:43:45 +0300 |
| commit | e456ddaa304edbe5cca3c5561764ebf9dd4b6732 (patch) | |
| tree | 46c78339e6c5a0b16e87d3422bd0805a1a334685 /Makefile.in | |
| parent | 1dce1b2ffb67907afff2cac62bb05361dac815e4 (diff) | |
| download | emacs-e456ddaa304edbe5cca3c5561764ebf9dd4b6732.tar.gz | |
Tweak Makefile emacs-module.h handling
* Makefile.in (install-arch-indep, uninstall): Respect DESTDIR.
Handle whitespace. Remove non-portable mkdir argument.
(cherry picked from commit c1d0dbd6ca92cb221024382b19654e4fbf1d1ed3)
Diffstat (limited to 'Makefile.in')
| -rw-r--r-- | Makefile.in | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Makefile.in b/Makefile.in index 77498181650..f48f785fcca 100644 --- a/Makefile.in +++ b/Makefile.in @@ -561,8 +561,8 @@ set_installuser=for installuser in $${LOGNAME} $${USERNAME} $${USER} \ ## See also these comments from 2004 about cp -r working fine: ## https://lists.gnu.org/r/autoconf-patches/2004-11/msg00005.html install-arch-indep: lisp install-info install-man ${INSTALL_ARCH_INDEP_EXTRA} - umask 022 && $(MKDIR_P) -m 0755 $(includedir) - $(INSTALL_DATA) src/emacs-module.h $(includedir)/emacs-module.h + umask 022 && $(MKDIR_P) "$(DESTDIR)$(includedir)" + $(INSTALL_DATA) src/emacs-module.h "$(DESTDIR)$(includedir)/emacs-module.h" -set ${COPYDESTS} ; \ unset CDPATH; \ $(set_installuser); \ @@ -746,7 +746,7 @@ install-strip: ### ### Don't delete the lisp and etc directories if they're in the source tree. uninstall: uninstall-$(NTDIR) uninstall-doc - rm -f $(includedir)/emacs-module.h + rm -f "$(DESTDIR)$(includedir)/emacs-module.h" $(MAKE) -C lib-src uninstall -unset CDPATH; \ for dir in "$(DESTDIR)${lispdir}" "$(DESTDIR)${etcdir}" ; do \ |