aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlenn Morris2018-10-03 16:47:01 -0400
committerEli Zaretskii2018-10-16 18:43:45 +0300
commite456ddaa304edbe5cca3c5561764ebf9dd4b6732 (patch)
tree46c78339e6c5a0b16e87d3422bd0805a1a334685
parent1dce1b2ffb67907afff2cac62bb05361dac815e4 (diff)
downloademacs-e456ddaa304edbe5cca3c5561764ebf9dd4b6732.tar.gz
emacs-e456ddaa304edbe5cca3c5561764ebf9dd4b6732.zip
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)
-rw-r--r--Makefile.in6
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} \
561## See also these comments from 2004 about cp -r working fine: 561## See also these comments from 2004 about cp -r working fine:
562## https://lists.gnu.org/r/autoconf-patches/2004-11/msg00005.html 562## https://lists.gnu.org/r/autoconf-patches/2004-11/msg00005.html
563install-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) 564 umask 022 && $(MKDIR_P) "$(DESTDIR)$(includedir)"
565 $(INSTALL_DATA) src/emacs-module.h $(includedir)/emacs-module.h 565 $(INSTALL_DATA) src/emacs-module.h "$(DESTDIR)$(includedir)/emacs-module.h"
566 -set ${COPYDESTS} ; \ 566 -set ${COPYDESTS} ; \
567 unset CDPATH; \ 567 unset CDPATH; \
568 $(set_installuser); \ 568 $(set_installuser); \
@@ -746,7 +746,7 @@ install-strip:
746### 746###
747### 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.
748uninstall: uninstall-$(NTDIR) uninstall-doc 748uninstall: uninstall-$(NTDIR) uninstall-doc
749 rm -f $(includedir)/emacs-module.h 749 rm -f "$(DESTDIR)$(includedir)/emacs-module.h"
750 $(MAKE) -C lib-src uninstall 750 $(MAKE) -C lib-src uninstall
751 -unset CDPATH; \ 751 -unset CDPATH; \
752 for dir in "$(DESTDIR)${lispdir}" "$(DESTDIR)${etcdir}" ; do \ 752 for dir in "$(DESTDIR)${lispdir}" "$(DESTDIR)${etcdir}" ; do \