diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2024-07-15 19:41:35 -0700 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2024-07-16 15:37:22 -0700 |
| commit | a826296cff6ac1c636db83ff66199c60b69cdeb3 (patch) | |
| tree | e6d1138c87582acb71b39b3c336c594180f27064 /Makefile.in | |
| parent | a86c25c91f39a25a93d18c9267e024822c1bc43e (diff) | |
Quote BIN_DESTDIR better
* Makefile.in (BIN_DESTDIR, install-eln, uninstall):
* src/Makefile.in ($(pdmp)):
Be more consistent about quoting BIN_DESTDIR and ELN_DESTDIR,
avoiding double-quoting ''like this'' which does not work as
expected.
Diffstat (limited to 'Makefile.in')
| -rw-r--r-- | Makefile.in | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/Makefile.in b/Makefile.in index 20394cb333d..2ab8cf0ecc5 100644 --- a/Makefile.in +++ b/Makefile.in @@ -361,10 +361,10 @@ COPYDIR = ${srcdir}/etc ${srcdir}/lisp COPYDESTS = "$(DESTDIR)${etcdir}" "$(DESTDIR)${lispdir}" ifeq (${ns_self_contained},no) -BIN_DESTDIR='$(DESTDIR)${bindir}/' +BIN_DESTDIR = $(DESTDIR)${bindir}/ ELN_DESTDIR = $(DESTDIR)${libdir}/emacs/${version}/ else -BIN_DESTDIR='${ns_appbindir}/' +BIN_DESTDIR = ${ns_appbindir}/ ELN_DESTDIR = ${ns_applibdir}/ endif @@ -915,8 +915,8 @@ install-etc: install-eln: lisp ifeq ($(HAVE_NATIVE_COMP),yes) umask 022 ; \ - find native-lisp -type d -exec $(MKDIR_P) "$(ELN_DESTDIR){}" \; ; \ - find native-lisp -type f -exec ${INSTALL_ELN} "{}" "$(ELN_DESTDIR){}" \; + find native-lisp -type d -exec $(MKDIR_P) '$(ELN_DESTDIR){}' \; ; \ + find native-lisp -type f -exec ${INSTALL_ELN} '{}' '$(ELN_DESTDIR){}' \; endif ### Build Emacs and install it, stripping binaries while installing them. @@ -931,7 +931,7 @@ uninstall: uninstall-$(NTDIR) uninstall-doc uninstall-gsettings-schemas rm -f "$(DESTDIR)$(includedir)/emacs-module.h" $(MAKE) -C lib-src uninstall -unset CDPATH; \ - for dir in "$(DESTDIR)${lispdir}" "$(DESTDIR)${etcdir}" "$(ELN_DESTDIR)" ; do \ + for dir in "$(DESTDIR)${lispdir}" "$(DESTDIR)${etcdir}" '$(ELN_DESTDIR)' ; do \ if [ -d "$${dir}" ]; then \ case `cd "$${dir}" ; pwd -P` in \ "`cd ${srcdir} ; pwd -P`"* ) ;; \ |