procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Tweak Makefile emacs-module.h handling

Browse source 
* Makefile.in (install-arch-indep, uninstall): Respect DESTDIR.
Handle whitespace.  Remove non-portable mkdir argument.

(cherry picked from commit c1d0dbd6ca)
This commit is contained in:
Glenn Morris 2018-10-03 16:47:01 -04:00 • committed by Eli Zaretskii
parent 1dce1b2ffb
commit e456ddaa30
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
Makefile.in
View file

@ -561,8 +561,8 @@ set_installuser=for installuser in $${LOGNAME} $${USERNAME} $${USER} \
## See also these comments from 2004 about cp -r working fine: ## See also these comments from 2004 about cp -r working fine:
## https://lists.gnu.org/r/autoconf-patches/2004-11/msg00005.html ## https://lists.gnu.org/r/autoconf-patches/2004-11/msg00005.html
install-arch-indep: lisp install-info install-man ${INSTALL_ARCH_INDEP_EXTRA} install-arch-indep: lisp install-info install-man ${INSTALL_ARCH_INDEP_EXTRA}
umask 022 && $(MKDIR_P) -m 0755 $(includedir) umask 022 && $(MKDIR_P) "$(DESTDIR)$(includedir)"
$(INSTALL_DATA) src/emacs-module.h $(includedir)/emacs-module.h $(INSTALL_DATA) src/emacs-module.h "$(DESTDIR)$(includedir)/emacs-module.h"
-set ${COPYDESTS} ; \ -set ${COPYDESTS} ; \
unset CDPATH; \ unset CDPATH; \
$(set_installuser); \ $(set_installuser); \
@ -746,7 +746,7 @@ install-strip:
### ###
### Don't delete the lisp and etc directories if they're in the source tree. ### Don't delete the lisp and etc directories if they're in the source tree.
uninstall: uninstall-$(NTDIR) uninstall-doc uninstall: uninstall-$(NTDIR) uninstall-doc
rm -f $(includedir)/emacs-module.h rm -f "$(DESTDIR)$(includedir)/emacs-module.h"
$(MAKE) -C lib-src uninstall $(MAKE) -C lib-src uninstall
-unset CDPATH; \ -unset CDPATH; \
for dir in "$(DESTDIR)${lispdir}" "$(DESTDIR)${etcdir}" ; do \ for dir in "$(DESTDIR)${lispdir}" "$(DESTDIR)${etcdir}" ; do \