Commit 48f73cfb authored by Glenn Morris's avatar Glenn Morris

Progress towards allowing installation in directories with whitespace

* Makefile.in (COPYDESTS, write_subdir, install-arch-dep)
(install-arch-indep, install-etcdoc, install-info, install-man)
(install-etc, uninstall): Quote entities that might contain whitespace.

* build-aux/update-subdirs: Handle whitespace in argument.
Check cd return value.

* doc/emacs/Makefile.in (install-dvi, install-html, install-pdf)
(install-ps, uninstall-dvi, uninstall-html, uninstall-ps)
(uninstall-pdf): Quote entities that might contain whitespace.

* doc/lispintro/Makefile.in (install-dvi, install-html, install-pdf)
(install-ps, uninstall-dvi, uninstall-html, uninstall-ps)
(uninstall-pdf): Quote entities that might contain whitespace.

* doc/lispref/Makefile.in (install-dvi, install-html, install-pdf)
(install-ps, uninstall-dvi, uninstall-html, uninstall-ps)
(uninstall-pdf): Quote entities that might contain whitespace.

* doc/misc/Makefile.in (install-dvi, install-html, install-pdf)
(install-ps, uninstall-dvi, uninstall-html, uninstall-ps)
(uninstall-pdf): Quote entities that might contain whitespace.

* lib-src/Makefile.in ($(DESTDIR)${archlibdir}, need-blessmail, install)
(uninstall): Quote entities that might contain whitespace.

* nt/Makefile.in ($(DESTDIR)${archlibdir}, install, uninstall):
Quote entities that might contain whitespace.
parent b8e3b0a9
2013-10-23 Glenn Morris <rgm@gnu.org> 2013-10-23 Glenn Morris <rgm@gnu.org>
Progress towards allowing installation in directories with whitespace.
* Makefile.in (COPYDESTS, write_subdir, install-arch-dep)
(install-arch-indep, install-etcdoc, install-info, install-man)
(install-etc, uninstall): Quote entities that might contain whitespace.
* build-aux/update-subdirs: Handle whitespace in argument.
Check cd return value.
Make building in directories with whitespace possible. (Bug#15675) Make building in directories with whitespace possible. (Bug#15675)
* configure.ac (srcdir): Don't make it absolute - abs_srcdir exists. * configure.ac (srcdir): Don't make it absolute - abs_srcdir exists.
* Makefile.in (abs_srcdir): New, set by configure. * Makefile.in (abs_srcdir): New, set by configure.
......
...@@ -284,7 +284,7 @@ SUBDIR_MAKEFILES = `echo $(SUBDIR_MAKEFILES_IN:.in=) | sed 's|$(srcdir)/||g'` ...@@ -284,7 +284,7 @@ SUBDIR_MAKEFILES = `echo $(SUBDIR_MAKEFILES_IN:.in=) | sed 's|$(srcdir)/||g'`
# separately. quail appears twice because in out-of-tree builds, it # separately. quail appears twice because in out-of-tree builds, it
# exists twice. # exists twice.
COPYDIR = ${srcdir}/etc ${srcdir}/lisp ${srcdir}/leim/ja-dic ${srcdir}/leim/quail leim/quail COPYDIR = ${srcdir}/etc ${srcdir}/lisp ${srcdir}/leim/ja-dic ${srcdir}/leim/quail leim/quail
COPYDESTS = $(DESTDIR)${etcdir} $(DESTDIR)${lispdir} $(DESTDIR)${leimdir}/ja-dic $(DESTDIR)${leimdir}/quail $(DESTDIR)${leimdir}/quail COPYDESTS = "$(DESTDIR)${etcdir}" "$(DESTDIR)${lispdir}" "$(DESTDIR)${leimdir}/ja-dic" "$(DESTDIR)${leimdir}/quail" "$(DESTDIR)${leimdir}/quail"
all: ${SUBDIR} all: ${SUBDIR}
...@@ -469,32 +469,32 @@ install: all install-arch-indep install-etcdoc install-arch-dep install-$(NTDIR) ...@@ -469,32 +469,32 @@ install: all install-arch-indep install-etcdoc install-arch-dep install-$(NTDIR)
## world-readable. ## world-readable.
## TODO it might be good to warn about non-standard permissions of ## TODO it might be good to warn about non-standard permissions of
## pre-existing directories, but that does not seem easy. ## pre-existing directories, but that does not seem easy.
write_subdir=if [ -f $${subdir}/subdirs.el ]; \ write_subdir=if [ -f "$${subdir}/subdirs.el" ]; \
then true; \ then true; \
else \ else \
umask 022; \ umask 022; \
${MKDIR_P} $${subdir}; \ ${MKDIR_P} "$${subdir}"; \
(echo "(if (fboundp 'normal-top-level-add-subdirs-to-load-path)"; \ (echo "(if (fboundp 'normal-top-level-add-subdirs-to-load-path)"; \
echo " (normal-top-level-add-subdirs-to-load-path))") \ echo " (normal-top-level-add-subdirs-to-load-path))") \
> $${subdir}/subdirs.el; \ > "$${subdir}/subdirs.el"; \
fi fi
### Install the executables that were compiled specifically for this machine. ### Install the executables that were compiled specifically for this machine.
### We do install-arch-indep first because the executable needs the ### We do install-arch-indep first because the executable needs the
### Lisp files and DOC file to work properly. ### Lisp files and DOC file to work properly.
install-arch-dep: src install-arch-indep install-etcdoc install-$(NTDIR) install-arch-dep: src install-arch-indep install-etcdoc install-$(NTDIR)
umask 022; ${MKDIR_P} $(DESTDIR)${bindir} umask 022; ${MKDIR_P} "$(DESTDIR)${bindir}"
cd lib-src && \ cd lib-src && \
$(MAKE) install $(MFLAGS) prefix=${prefix} \ $(MAKE) install $(MFLAGS) prefix=${prefix} \
exec_prefix=${exec_prefix} bindir=${bindir} \ exec_prefix=${exec_prefix} bindir=${bindir} \
libexecdir=${libexecdir} archlibdir=${archlibdir} \ libexecdir=${libexecdir} archlibdir=${archlibdir} \
INSTALL_STRIP=${INSTALL_STRIP} INSTALL_STRIP=${INSTALL_STRIP}
if test "${ns_self_contained}" = "no"; then \ if test "${ns_self_contained}" = "no"; then \
${INSTALL_PROGRAM} $(INSTALL_STRIP) src/emacs${EXEEXT} $(DESTDIR)${bindir}/$(EMACSFULL) || exit 1 ; \ ${INSTALL_PROGRAM} $(INSTALL_STRIP) src/emacs${EXEEXT} "$(DESTDIR)${bindir}/$(EMACSFULL)" || exit 1 ; \
chmod 1755 $(DESTDIR)${bindir}/$(EMACSFULL) || true; \ chmod 1755 "$(DESTDIR)${bindir}/$(EMACSFULL)" || true; \
if test "x${NO_BIN_LINK}" = x; then \ if test "x${NO_BIN_LINK}" = x; then \
rm -f $(DESTDIR)${bindir}/$(EMACS) ; \ rm -f "$(DESTDIR)${bindir}/$(EMACS)" ; \
cd $(DESTDIR)${bindir} && $(LN_S_FILEONLY) $(EMACSFULL) $(EMACS); \ cd "$(DESTDIR)${bindir}" && $(LN_S_FILEONLY) $(EMACSFULL) $(EMACS); \
fi; \ fi; \
else \ else \
subdir=${ns_appresdir}/site-lisp; \ subdir=${ns_appresdir}/site-lisp; \
...@@ -568,62 +568,63 @@ install-arch-indep: lisp leim install-info install-man ${INSTALL_ARCH_INDEP_EXTR ...@@ -568,62 +568,63 @@ install-arch-indep: lisp leim install-info install-man ${INSTALL_ARCH_INDEP_EXTR
$(set_installuser); \ $(set_installuser); \
for dir in ${COPYDIR} ; do \ for dir in ${COPYDIR} ; do \
[ -d $${dir} ] || exit 1 ; \ [ -d $${dir} ] || exit 1 ; \
dest=$$1 ; shift ; \ dest="$$1" ; shift ; \
[ -d $${dest} ] && \ [ -d "$${dest}" ] && \
[ "`cd $${dest} && /bin/pwd`" = "`cd $${dir} && /bin/pwd`" ] && \ [ "`cd \"$${dest}\" && /bin/pwd`" = "`cd $${dir} && /bin/pwd`" ] && \
continue ; \ continue ; \
if [ "$${dir}" = "leim/quail" ]; then \ if [ "$${dir}" = "leim/quail" ]; then \
[ "`cd $${dir} && /bin/pwd`" = "`cd ${srcdir}/leim/quail && /bin/pwd`" ] && \ [ "`cd $${dir} && /bin/pwd`" = "`cd ${srcdir}/leim/quail && /bin/pwd`" ] && \
continue ; \ continue ; \
else \ else \
rm -rf $${dest} ; \ rm -rf "$${dest}" ; \
umask 022; ${MKDIR_P} $${dest} ; \ umask 022; ${MKDIR_P} "$${dest}" ; \
fi ; \ fi ; \
echo "Copying $${dir} to $${dest}..." ; \ echo "Copying $${dir} to $${dest}..." ; \
(cd $${dir}; tar -chf - . ) \ (cd $${dir}; tar -chf - . ) \
| (cd $${dest}; umask 022; \ | (cd "$${dest}"; umask 022; \
tar -xvf - && cat > /dev/null) || exit 1; \ tar -xvf - && cat > /dev/null) || exit 1; \
if [ "$${dir}" = "${srcdir}/etc" ]; then \ if [ "$${dir}" = "${srcdir}/etc" ]; then \
rm -f $${dest}/DOC* ; \ rm -f "$${dest}/DOC"* ; \
rm -f $${dest}/refcards/*.aux $${dest}/refcards/*.dvi; \ rm -f "$${dest}/refcards"/*.aux "$${dest}/refcards"/*.dvi; \
rm -f $${dest}/refcards/*.log; \ rm -f "$${dest}/refcards"/*.log; \
else true; \ else true; \
fi; \ fi; \
for subdir in `find $${dest} -type d -print` ; do \ (cd "$${dest}" || exit 1; \
chmod a+rx $${subdir} ; \ for subdir in `find . -type d -print` ; do \
rm -f $${subdir}/.gitignore ; \ chmod a+rx $${subdir} ; \
rm -f $${subdir}/.arch-inventory ; \ rm -f $${subdir}/.gitignore ; \
rm -f $${subdir}/.DS_Store ; \ rm -f $${subdir}/.arch-inventory ; \
rm -f $${subdir}/\#* ; \ rm -f $${subdir}/.DS_Store ; \
rm -f $${subdir}/.\#* ; \ rm -f $${subdir}/\#* ; \
rm -f $${subdir}/*~ ; \ rm -f $${subdir}/.\#* ; \
rm -f $${subdir}/*.orig ; \ rm -f $${subdir}/*~ ; \
rm -f $${subdir}/ChangeLog* ; \ rm -f $${subdir}/*.orig ; \
[ "$${dir}" != "${srcdir}/etc" ] && \ rm -f $${subdir}/ChangeLog* ; \
rm -f $${subdir}/[mM]akefile*[.-]in $${subdir}/[mM]akefile ; \ [ "$${dir}" != "${srcdir}/etc" ] && \
done ; \ rm -f $${subdir}/[mM]akefile*[.-]in $${subdir}/[mM]akefile ; \
find $${dest} -exec chown $${installuser} {} ';' ;\ done ); \
find "$${dest}" -exec chown $${installuser} {} ';' ;\
done done
-rm -f $(DESTDIR)${leimdir}/leim-list.el -rm -f "$(DESTDIR)${leimdir}/leim-list.el"
${INSTALL_DATA} leim/leim-list.el $(DESTDIR)${leimdir}/leim-list.el ${INSTALL_DATA} leim/leim-list.el "$(DESTDIR)${leimdir}/leim-list.el"
-rm -f $(DESTDIR)${lispdir}/subdirs.el -rm -f "$(DESTDIR)${lispdir}/subdirs.el"
umask 022; $(srcdir)/build-aux/update-subdirs $(DESTDIR)${lispdir} umask 022; $(srcdir)/build-aux/update-subdirs "$(DESTDIR)${lispdir}"
subdir=$(DESTDIR)${datadir}/emacs/${version}/site-lisp ; \ subdir="$(DESTDIR)${datadir}/emacs/${version}/site-lisp" ; \
${write_subdir} ${write_subdir}
subdir=$(DESTDIR)${datadir}/emacs/site-lisp ; \ subdir="$(DESTDIR)${datadir}/emacs/site-lisp" ; \
${write_subdir} || true ${write_subdir} || true
[ -z "${GZIP_PROG}" ] || \ [ -z "${GZIP_PROG}" ] || \
( echo "Compressing *.el ..." ; \ ( echo "Compressing *.el ..." ; \
unset CDPATH; \ unset CDPATH; \
thisdir=`/bin/pwd`; \ thisdir=`/bin/pwd`; \
for dir in $(DESTDIR)${lispdir} $(DESTDIR)${leimdir}; do \ for dir in "$(DESTDIR)${lispdir}" "$(DESTDIR)${leimdir}"; do \
cd "$${thisdir}" ; \ cd "$${thisdir}" ; \
cd $${dir} || exit 1 ; \ cd "$${dir}" || exit 1 ; \
for f in `find . -name "*.elc" -print`; do \ for f in `find . -name "*.elc" -print`; do \
${GZIP_PROG} -9n `echo $$f|sed 's/.elc$$/.el/'` ; \ ${GZIP_PROG} -9n "`echo \"$$f\" | sed 's/.elc$$/.el/'`" ; \
done ; \ done ; \
done ) done )
-chmod -R a+r $(DESTDIR)${datadir}/emacs/${version} ${COPYDESTS} -chmod -R a+r "$(DESTDIR)${datadir}/emacs/${version}" ${COPYDESTS}
## The above chmods are needed because "umask 022; tar ..." is not ## The above chmods are needed because "umask 022; tar ..." is not
## guaranteed to do the right thing; eg if we are root and tar is ## guaranteed to do the right thing; eg if we are root and tar is
...@@ -633,40 +634,40 @@ install-arch-indep: lisp leim install-info install-man ${INSTALL_ARCH_INDEP_EXTR ...@@ -633,40 +634,40 @@ install-arch-indep: lisp leim install-info install-man ${INSTALL_ARCH_INDEP_EXTR
## installed etc/ directory, so we need it to run before this does. ## installed etc/ directory, so we need it to run before this does.
install-etcdoc: src install-arch-indep install-etcdoc: src install-arch-indep
-unset CDPATH; \ -unset CDPATH; \
umask 022; ${MKDIR_P} $(DESTDIR)${etcdocdir} ; \ umask 022; ${MKDIR_P} "$(DESTDIR)${etcdocdir}" ; \
if [ "`cd ./etc; /bin/pwd`" != "`cd $(DESTDIR)${etcdocdir}; /bin/pwd`" ]; \ if [ "`cd ./etc; /bin/pwd`" != "`cd \"$(DESTDIR)${etcdocdir}\"; /bin/pwd`" ]; \
then \ then \
docfile="DOC"; \ docfile="DOC"; \
echo "Copying etc/$${docfile} to $(DESTDIR)${etcdocdir} ..." ; \ echo "Copying etc/$${docfile} to $(DESTDIR)${etcdocdir} ..." ; \
${INSTALL_DATA} etc/$${docfile} $(DESTDIR)${etcdocdir}/$${docfile}; \ ${INSTALL_DATA} etc/$${docfile} "$(DESTDIR)${etcdocdir}/$${docfile}"; \
$(set_installuser); \ $(set_installuser); \
chown $${installuser} $(DESTDIR)${etcdocdir}/$${docfile} || true ; \ chown $${installuser} "$(DESTDIR)${etcdocdir}/$${docfile}" || true ; \
else true; fi else true; fi
install-info: info install-info: info
umask 022; ${MKDIR_P} $(DESTDIR)${infodir} umask 022; ${MKDIR_P} "$(DESTDIR)${infodir}"
-unset CDPATH; \ -unset CDPATH; \
thisdir=`/bin/pwd`; \ thisdir=`/bin/pwd`; \
if [ "`cd ${srcdir}/info && /bin/pwd`" = "`cd $(DESTDIR)${infodir} && /bin/pwd`" ]; then \ if [ "`cd ${srcdir}/info && /bin/pwd`" = "`cd \"$(DESTDIR)${infodir}\" && /bin/pwd`" ]; then \
true; \ true; \
else \ else \
(cd "$(DESTDIR)${infodir}"; \ (cd "$(DESTDIR)${infodir}"; \
[ -f dir ] || \ [ -f dir ] || \
(cd "$${thisdir}"; \ (cd "$${thisdir}"; \
${INSTALL_DATA} ${srcdir}/info/dir $(DESTDIR)${infodir}/dir) ); \ ${INSTALL_DATA} ${srcdir}/info/dir "$(DESTDIR)${infodir}/dir") ); \
info_misc=`cd doc/misc && $(QUIET_SUBMAKE) $(MAKE) -s echo-info`; \ info_misc=`cd doc/misc && $(QUIET_SUBMAKE) $(MAKE) -s echo-info`; \
cd ${srcdir}/info ; \ cd ${srcdir}/info ; \
for elt in ${INFO_NONMISC} $${info_misc}; do \ for elt in ${INFO_NONMISC} $${info_misc}; do \
test "$(HAVE_MAKEINFO)" = "no" && test ! -f $$elt && continue; \ test "$(HAVE_MAKEINFO)" = "no" && test ! -f $$elt && continue; \
for f in `ls $$elt $$elt-[1-9] $$elt-[1-9][0-9] 2>/dev/null`; do \ for f in `ls $$elt $$elt-[1-9] $$elt-[1-9][0-9] 2>/dev/null`; do \
(cd "$${thisdir}"; \ (cd "$${thisdir}"; \
${INSTALL_DATA} ${srcdir}/info/$$f $(DESTDIR)${infodir}/$$f); \ ${INSTALL_DATA} ${srcdir}/info/$$f "$(DESTDIR)${infodir}/$$f"); \
[ -n "${GZIP_PROG}" ] || continue ; \ [ -n "${GZIP_PROG}" ] || continue ; \
rm -f $(DESTDIR)${infodir}/$$f.gz; \ rm -f "$(DESTDIR)${infodir}/$$f.gz"; \
${GZIP_PROG} -9n $(DESTDIR)${infodir}/$$f; \ ${GZIP_PROG} -9n "$(DESTDIR)${infodir}/$$f"; \
done; \ done; \
(cd "$${thisdir}"; \ (cd "$${thisdir}"; \
${INSTALL_INFO} --info-dir=$(DESTDIR)${infodir} $(DESTDIR)${infodir}/$$elt); \ ${INSTALL_INFO} --info-dir="$(DESTDIR)${infodir}" "$(DESTDIR)${infodir}/$$elt"); \
done; \ done; \
fi fi
...@@ -677,16 +678,16 @@ install-info: info ...@@ -677,16 +678,16 @@ install-info: info
## ctags.1 is compressed or not. "gzip -f" is another option here, ## ctags.1 is compressed or not. "gzip -f" is another option here,
## but not sure if portable. ## but not sure if portable.
install-man: install-man:
umask 022; ${MKDIR_P} $(DESTDIR)${man1dir} umask 022; ${MKDIR_P} "$(DESTDIR)${man1dir}"
thisdir=`/bin/pwd`; \ thisdir=`/bin/pwd`; \
cd ${mansrcdir}; \ cd ${mansrcdir}; \
for page in *.1; do \ for page in *.1; do \
dest=`echo "$${page}" | sed -e 's/\.1$$//' -e '$(TRANSFORM)'`.1; \ dest=`echo "$${page}" | sed -e 's/\.1$$//' -e '$(TRANSFORM)'`.1; \
(cd "$${thisdir}"; \ (cd "$${thisdir}"; \
${INSTALL_DATA} ${mansrcdir}/$${page} $(DESTDIR)${man1dir}/$${dest}); \ ${INSTALL_DATA} ${mansrcdir}/$${page} "$(DESTDIR)${man1dir}/$${dest}"); \
[ -n "${GZIP_PROG}" ] || continue ; \ [ -n "${GZIP_PROG}" ] || continue ; \
rm -f $(DESTDIR)${man1dir}/$${dest}.gz; \ rm -f "$(DESTDIR)${man1dir}/$${dest}.gz"; \
${GZIP_PROG} -9n $(DESTDIR)${man1dir}/$${dest} || true; \ ${GZIP_PROG} -9n "$(DESTDIR)${man1dir}/$${dest}" || true; \
done done
## Install those items from etc/ that need to end up elsewhere. ## Install those items from etc/ that need to end up elsewhere.
...@@ -696,25 +697,25 @@ install-man: ...@@ -696,25 +697,25 @@ install-man:
EMACS_ICON=emacs EMACS_ICON=emacs
install-etc: install-etc:
umask 022; ${MKDIR_P} $(DESTDIR)${desktopdir} umask 022; ${MKDIR_P} "$(DESTDIR)${desktopdir}"
tmp=etc/emacs.tmpdesktop; rm -f $${tmp}; \ tmp=etc/emacs.tmpdesktop; rm -f $${tmp}; \
emacs_name=`echo emacs | sed '$(TRANSFORM)'`; \ emacs_name=`echo emacs | sed '$(TRANSFORM)'`; \
sed -e "/^Exec=emacs/ s/emacs/$${emacs_name}/" \ sed -e "/^Exec=emacs/ s/emacs/$${emacs_name}/" \
-e "/^Icon=emacs/ s/emacs/$${emacs_name}/" \ -e "/^Icon=emacs/ s/emacs/$${emacs_name}/" \
${srcdir}/etc/emacs.desktop > $${tmp}; \ ${srcdir}/etc/emacs.desktop > $${tmp}; \
${INSTALL_DATA} $${tmp} $(DESTDIR)${desktopdir}/${EMACS_NAME}.desktop; \ ${INSTALL_DATA} $${tmp} "$(DESTDIR)${desktopdir}/${EMACS_NAME}.desktop"; \
rm -f $${tmp} rm -f $${tmp}
thisdir=`/bin/pwd`; \ thisdir=`/bin/pwd`; \
cd ${iconsrcdir} || exit 1; umask 022 ; \ cd ${iconsrcdir} || exit 1; umask 022 ; \
for dir in */*/apps */*/mimetypes; do \ for dir in */*/apps */*/mimetypes; do \
[ -d $${dir} ] || continue ; \ [ -d $${dir} ] || continue ; \
( cd "$${thisdir}"; ${MKDIR_P} $(DESTDIR)${icondir}/$${dir} ) ; \ ( cd "$${thisdir}"; ${MKDIR_P} "$(DESTDIR)${icondir}/$${dir}" ) ; \
for icon in $${dir}/${EMACS_ICON}[.-]*; do \ for icon in $${dir}/${EMACS_ICON}[.-]*; do \
[ -r $${icon} ] || continue ; \ [ -r $${icon} ] || continue ; \
ext=`echo "$${icon}" | sed -e 's|.*\.||'`; \ ext=`echo "$${icon}" | sed -e 's|.*\.||'`; \
dest=`echo "$${icon}" | sed -e 's|.*/||' -e "s|\.$${ext}$$||" -e 's/$(EMACS_ICON)/emacs/' -e '$(TRANSFORM)'`.$${ext} ; \ dest=`echo "$${icon}" | sed -e 's|.*/||' -e "s|\.$${ext}$$||" -e 's/$(EMACS_ICON)/emacs/' -e '$(TRANSFORM)'`.$${ext} ; \
( cd "$${thisdir}"; \ ( cd "$${thisdir}"; \
${INSTALL_DATA} ${iconsrcdir}/$${icon} $(DESTDIR)${icondir}/$${dir}/$${dest} ) \ ${INSTALL_DATA} ${iconsrcdir}/$${icon} "$(DESTDIR)${icondir}/$${dir}/$${dest}" ) \
|| exit 1; \ || exit 1; \
done ; \ done ; \
done done
...@@ -734,26 +735,26 @@ uninstall: uninstall-$(NTDIR) uninstall-doc ...@@ -734,26 +735,26 @@ uninstall: uninstall-$(NTDIR) uninstall-doc
bindir=${bindir} libexecdir=${libexecdir} archlibdir=${archlibdir} bindir=${bindir} libexecdir=${libexecdir} archlibdir=${archlibdir}
-unset CDPATH; \ -unset CDPATH; \
for dir in $(DESTDIR)${lispdir} $(DESTDIR)${etcdir} ; do \ for dir in "$(DESTDIR)${lispdir}" "$(DESTDIR)${etcdir}" ; do \
if [ -d $${dir} ]; then \ if [ -d "$${dir}" ]; then \
case "`cd $${dir} ; /bin/pwd`" in \ case `cd "$${dir}" ; /bin/pwd` in \
"`cd ${srcdir} ; /bin/pwd`"* ) ;; \ "`cd ${srcdir} ; /bin/pwd`"* ) ;; \
* ) rm -rf $${dir} ;; \ * ) rm -rf "$${dir}" ;; \
esac ; \ esac ; \
case $${dir} in \ case "$${dir}" in \
$(DESTDIR)${datadir}/emacs/${version}/* ) \ "$(DESTDIR)${datadir}/emacs/${version}"/* ) \
rm -rf $(DESTDIR)${datadir}/emacs/${version} \ rm -rf "$(DESTDIR)${datadir}/emacs/${version}" \
;; \ ;; \
esac ; \ esac ; \
fi ; \ fi ; \
done done
-rm -rf $(DESTDIR)${libexecdir}/emacs/${version} -rm -rf "$(DESTDIR)${libexecdir}/emacs/${version}"
thisdir=`/bin/pwd`; \ thisdir=`/bin/pwd`; \
(info_misc=`cd doc/misc && $(QUIET_SUBMAKE) $(MAKE) -s echo-info`; \ (info_misc=`cd doc/misc && $(QUIET_SUBMAKE) $(MAKE) -s echo-info`; \
if cd $(DESTDIR)${infodir}; then \ if cd "$(DESTDIR)${infodir}"; then \
for elt in ${INFO_NONMISC} $${info_misc}; do \ for elt in ${INFO_NONMISC} $${info_misc}; do \
(cd "$${thisdir}"; \ (cd "$${thisdir}"; \
$(INSTALL_INFO) --remove --info-dir=$(DESTDIR)${infodir} $(DESTDIR)${infodir}/$$elt); \ $(INSTALL_INFO) --remove --info-dir="$(DESTDIR)${infodir}" "$(DESTDIR)${infodir}/$$elt"); \
if [ -n "${GZIP_PROG}" ]; then \ if [ -n "${GZIP_PROG}" ]; then \
ext=.gz; else ext=; fi; \ ext=.gz; else ext=; fi; \
rm -f $$elt$$ext $$elt-[1-9]$$ext $$elt-[1-9][0-9]$$ext; \ rm -f $$elt$$ext $$elt-[1-9]$$ext $$elt-[1-9][0-9]$$ext; \
...@@ -763,18 +764,18 @@ uninstall: uninstall-$(NTDIR) uninstall-doc ...@@ -763,18 +764,18 @@ uninstall: uninstall-$(NTDIR) uninstall-doc
ext=.gz; else ext=; fi; \ ext=.gz; else ext=; fi; \
if cd ${mansrcdir}; then \ if cd ${mansrcdir}; then \
for page in *.1; do \ for page in *.1; do \
rm -f $(DESTDIR)${man1dir}/`echo "$${page}" | sed -e 's/\.1$$//' -e '$(TRANSFORM)'`.1$$ext; done; \ rm -f "$(DESTDIR)${man1dir}"/`echo "$${page}" | sed -e 's/\.1$$//' -e '$(TRANSFORM)'`.1$$ext; done; \
fi) fi)
(cd $(DESTDIR)${bindir} && rm -f $(EMACSFULL) $(EMACS) || true) (cd "$(DESTDIR)${bindir}" && rm -f $(EMACSFULL) $(EMACS) || true)
(if cd $(DESTDIR)${icondir}; then \ (if cd "$(DESTDIR)${icondir}"; then \
rm -f hicolor/*x*/apps/${EMACS_NAME}.png \ rm -f hicolor/*x*/apps/${EMACS_NAME}.png \
hicolor/scalable/apps/${EMACS_NAME}.svg \ hicolor/scalable/apps/${EMACS_NAME}.svg \
hicolor/scalable/mimetypes/`echo emacs-document | sed '$(TRANSFORM)'`.svg; \ hicolor/scalable/mimetypes/`echo emacs-document | sed '$(TRANSFORM)'`.svg; \
fi) fi)
-rm -f $(DESTDIR)${desktopdir}/${EMACS_NAME}.desktop -rm -f "$(DESTDIR)${desktopdir}/${EMACS_NAME}.desktop"
for file in snake-scores tetris-scores; do \ for file in snake-scores tetris-scores; do \
file=$(DESTDIR)${gamedir}/$${file}; \ file="$(DESTDIR)${gamedir}/$${file}"; \
[ -s $${file} ] || rm -f $$file; \ [ -s "$${file}" ] || rm -f "$$file"; \
done done
### Windows-specific uninstall target for removing programs produced ### Windows-specific uninstall target for removing programs produced
......
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
# along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. # along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>.
cd $1 cd "$1" || exit 1
for file in *; do for file in *; do
case $file in case $file in
*.elc | *.el | term | RCS | CVS | Old | . | .. | =* | *~ | *.orig | *.rej) *.elc | *.el | term | RCS | CVS | Old | . | .. | =* | *~ | *.orig | *.rej)
......
2013-10-23 Glenn Morris <rgm@gnu.org>
* Makefile.in (install-dvi, install-html, install-pdf)
(install-ps, uninstall-dvi, uninstall-html, uninstall-ps)
(uninstall-pdf): Quote entities that might contain whitespace.
2013-10-20 Xue Fuqiao <xfq.free@gmail.com> 2013-10-20 Xue Fuqiao <xfq.free@gmail.com>
* custom.texi (Init Syntax, Terminal Init, Terminal Init): Remove @refill. * custom.texi (Init Syntax, Terminal Init, Terminal Init):
Remove @refill.
2013-10-13 Glenn Morris <rgm@gnu.org> 2013-10-13 Glenn Morris <rgm@gnu.org>
......
...@@ -229,21 +229,21 @@ dist: ...@@ -229,21 +229,21 @@ dist:
.PHONY: install-dvi install-html install-pdf install-ps install-doc .PHONY: install-dvi install-html install-pdf install-ps install-doc
install-dvi: dvi install-dvi: dvi
umask 022; $(MKDIR_P) $(DESTDIR)$(dvidir) umask 022; $(MKDIR_P) "$(DESTDIR)$(dvidir)"
$(INSTALL_DATA) $(DVI_TARGETS) $(DESTDIR)$(dvidir) $(INSTALL_DATA) $(DVI_TARGETS) "$(DESTDIR)$(dvidir)"
install-html: html install-html: html
umask 022; $(MKDIR_P) $(DESTDIR)$(htmldir) umask 022; $(MKDIR_P) "$(DESTDIR)$(htmldir)"
$(INSTALL_DATA) $(HTML_TARGETS) $(DESTDIR)$(htmldir) $(INSTALL_DATA) $(HTML_TARGETS) "$(DESTDIR)$(htmldir)"
install-pdf: pdf install-pdf: pdf
umask 022;$(MKDIR_P) $(DESTDIR)$(pdfdir) umask 022;$(MKDIR_P) "$(DESTDIR)$(pdfdir)"
$(INSTALL_DATA) $(PDF_TARGETS) $(DESTDIR)$(pdfdir) $(INSTALL_DATA) $(PDF_TARGETS) "$(DESTDIR)$(pdfdir)"
install-ps: ps install-ps: ps
umask 022; $(MKDIR_P) $(DESTDIR)$(psdir) umask 022; $(MKDIR_P) "$(DESTDIR)$(psdir)"
for file in $(PS_TARGETS); do \ for file in $(PS_TARGETS); do \
$(INSTALL_DATA) $${file} $(DESTDIR)$(psdir); \ $(INSTALL_DATA) $${file} "$(DESTDIR)$(psdir)"; \
[ -n "${GZIP_PROG}" ] || continue; \ [ -n "${GZIP_PROG}" ] || continue; \
rm -f $(DESTDIR)$(psdir)/$${file}.gz; \ rm -f "$(DESTDIR)$(psdir)/$${file}.gz"; \
${GZIP_PROG} -9n $(DESTDIR)$(psdir)/$${file}; \ ${GZIP_PROG} -9n "$(DESTDIR)$(psdir)/$${file}"; \
done done
## Top-level Makefile installs the info pages. ## Top-level Makefile installs the info pages.
...@@ -254,20 +254,20 @@ install-doc: install-dvi install-html install-pdf install-ps ...@@ -254,20 +254,20 @@ install-doc: install-dvi install-html install-pdf install-ps
uninstall-dvi: uninstall-dvi:
for file in $(DVI_TARGETS); do \ for file in $(DVI_TARGETS); do \
rm -f $(DESTDIR)$(dvidir)/$${file}; \ rm -f "$(DESTDIR)$(dvidir)/$${file}"; \
done done
uninstall-html: uninstall-html:
for file in $(HTML_TARGETS); do \ for file in $(HTML_TARGETS); do \
rm -f $(DESTDIR)$(htmldir)/$${file}; \ rm -f "$(DESTDIR)$(htmldir)/$${file}"; \
done done
uninstall-ps: uninstall-ps:
ext= ; [ -n "${GZIP_PROG}" ] && ext=.gz; \ ext= ; [ -n "${GZIP_PROG}" ] && ext=.gz; \
for file in $(PS_TARGETS); do \ for file in $(PS_TARGETS); do \
rm -f $(DESTDIR)$(psdir)/$${file}$${ext}; \ rm -f "$(DESTDIR)$(psdir)/$${file}$${ext}"; \
done done
uninstall-pdf: uninstall-pdf:
for file in $(PDF_TARGETS); do \ for file in $(PDF_TARGETS); do \
rm -f $(DESTDIR)$(pdfdir)/$${file}; \ rm -f "$(DESTDIR)$(pdfdir)/$${file}"; \
done done
uninstall-doc: uninstall-dvi uninstall-html uninstall-pdf uninstall-ps uninstall-doc: uninstall-dvi uninstall-html uninstall-pdf uninstall-ps
......
2013-10-23 Glenn Morris <rgm@gnu.org>
* Makefile.in (install-dvi, install-html, install-pdf)
(install-ps, uninstall-dvi, uninstall-html, uninstall-ps)
(uninstall-pdf): Quote entities that might contain whitespace.
2013-09-01 Glenn Morris <rgm@gnu.org> 2013-09-01 Glenn Morris <rgm@gnu.org>
* emacs-lisp-intro.texi (beginning-of-buffer complete): * emacs-lisp-intro.texi (beginning-of-buffer complete):
......
...@@ -145,21 +145,21 @@ dist: ...@@ -145,21 +145,21 @@ dist:
.PHONY: install-dvi install-html install-pdf install-ps install-doc .PHONY: install-dvi install-html install-pdf install-ps install-doc
install-dvi: dvi install-dvi: dvi
umask 022; $(MKDIR_P) $(DESTDIR)$(dvidir) umask 022; $(MKDIR_P) "$(DESTDIR)$(dvidir)"
$(INSTALL_DATA) $(DVI_TARGETS) $(DESTDIR)$(dvidir) $(INSTALL_DATA) $(DVI_TARGETS) "$(DESTDIR)$(dvidir)"
install-html: html install-html: html
umask 022; $(MKDIR_P) $(DESTDIR)$(htmldir) umask 022; $(MKDIR_P) "$(DESTDIR)$(htmldir)"
$(INSTALL_DATA) $(HTML_TARGETS) $(DESTDIR)$(htmldir) $(INSTALL_DATA) $(HTML_TARGETS) "$(DESTDIR)$(htmldir)"
install-pdf: pdf install-pdf: pdf
umask 022;$(MKDIR_P) $(DESTDIR)$(pdfdir) umask 022;$(MKDIR_P) "$(DESTDIR)$(pdfdir)"
$(INSTALL_DATA) $(PDF_TARGETS) $(DESTDIR)$(pdfdir) $(INSTALL_DATA) $(PDF_TARGETS) "$(DESTDIR)$(pdfdir)"
install-ps: ps install-ps: ps
umask 022; $(MKDIR_P) $(DESTDIR)$(psdir) umask 022; $(MKDIR_P) "$(DESTDIR)$(psdir)"
for file in $(PS_TARGETS); do \ for file in $(PS_TARGETS); do \
$(INSTALL_DATA) $${file} $(DESTDIR)$(psdir); \ $(INSTALL_DATA) $${file} "$(DESTDIR)$(psdir)"; \
[ -n "${GZIP_PROG}" ] || continue; \ [ -n "${GZIP_PROG}" ] || continue; \
rm -f $(DESTDIR)$(psdir)/$${file}.gz; \ rm -f "$(DESTDIR)$(psdir)/$${file}.gz"; \
${GZIP_PROG} -9n $(DESTDIR)$(psdir)/$${file}; \ ${GZIP_PROG} -9n "$(DESTDIR)$(psdir)/$${file}"; \
done done
## Top-level Makefile installs the info pages. ## Top-level Makefile installs the info pages.
...@@ -170,20 +170,20 @@ install-doc: install-dvi install-html install-pdf install-ps ...@@ -170,20 +170,20 @@ install-doc: install-dvi install-html install-pdf install-ps
uninstall-dvi: uninstall-dvi:
for file in $(DVI_TARGETS); do \ for file in $(DVI_TARGETS); do \
rm -f $(DESTDIR)$(dvidir)/$${file}; \ rm -f "$(DESTDIR)$(dvidir)/$${file}"; \
done done
uninstall-html: uninstall-html:
for file in $(HTML_TARGETS); do \ for file in $(HTML_TARGETS); do \
rm -f $(DESTDIR)$(htmldir)/$${file}; \ rm -f "$(DESTDIR)$(htmldir)/$${file}"; \
done done
uninstall-ps: uninstall-ps:
ext= ; [ -n "${GZIP_PROG}" ] && ext=.gz; \ ext= ; [ -n "${GZIP_PROG}" ] && ext=.gz; \
for file in $(PS_TARGETS); do \ for file in $(PS_TARGETS); do \
rm -f $(DESTDIR