From 89a97129155bad4f46dd77a951038cef4c66e1f4 Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Thu, 13 Feb 2014 10:59:24 -0800 Subject: [PATCH] * Makefile.in (install-arch-indep): Simplify. This should make it more reliable, and hopefully more portable to non-GNU 'make' implementations such as HP-UX 'make'. Fixes: debbugs:16717 --- ChangeLog | 6 ++++++ Makefile.in | 17 +++++------------ 2 files changed, 11 insertions(+), 12 deletions(-) diff --git a/ChangeLog b/ChangeLog index 22f33b07b13..4a470cb0dcc 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2014-02-13 Paul Eggert + + * Makefile.in (install-arch-indep): Simplify (Bug#16717). + This should make it more reliable, and hopefully more portable to + non-GNU 'make' implementations such as HP-UX 'make'. + 2014-02-13 Juanma Barranquero * Makefile.in (install-nt): Also pass datadir. diff --git a/Makefile.in b/Makefile.in index 192c9483eb0..44ba084bee4 100644 --- a/Makefile.in +++ b/Makefile.in @@ -612,18 +612,11 @@ install-arch-indep: lisp install-info install-man ${INSTALL_ARCH_INDEP_EXTRA} ${write_subdir} subdir="$(DESTDIR)${datadir}/emacs/site-lisp" ; \ ${write_subdir} || true - [ -z "${GZIP_PROG}" ] || \ - ( echo "Compressing *.el ..." ; \ - unset CDPATH; \ - thisdir=`/bin/pwd`; \ - for dir in "$(DESTDIR)${lispdir}"; do \ - cd "$${thisdir}" ; \ - cd "$${dir}" || exit 1 ; \ - for f in `find . -name "*.elc" -print`; do \ - f_el=`echo "$$f" | sed 's/.elc$$/.el/'`; \ - ${GZIP_PROG} -9n "$$f_el" ; \ - done ; \ - done ) + [ -z "${GZIP_PROG}" ] || { \ + echo "Compressing *.el ..." && \ + find "$(DESTDIR)${lispdir}" -name '*.elc' -exec sh -c \ + '${GZIP_PROG} -9n `expr "$$@" : "\\(.*\\)c"`' dummy '{}' ';'; \ + } -chmod -R a+r "$(DESTDIR)${datadir}/emacs/${version}" ${COPYDESTS} ## The above chmods are needed because "umask 022; tar ..." is not -- 2.39.2