[Emacs-diffs] emacs-26 e456dda 2/2: Tweak Makefile emacs-module.h handling

[Eli Zaretskii]

branch: emacs-26
commit e456ddaa304edbe5cca3c5561764ebf9dd4b6732
Author: Glenn Morris <address@hidden>
Commit: Eli Zaretskii <address@hidden>

    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)
---
 Makefile.in | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Makefile.in b/Makefile.in
index 7749818..f48f785 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    \