Commit 904769ba authored by Glenn Morris's avatar Glenn Morris
Browse files

* Makefile.in (install-etc): Fix previous change.

Remember to always call MKDIR_P and INSTALL_DATA from the top-level
directory, for the case in which we are falling back to build-aux/install-sh.
It would make life much easier if autoconf would use an absolute path
in this case.
parent d9a1e2c2
......@@ -641,13 +641,16 @@ install-etc:
umask 022; ${MKDIR_P} $(DESTDIR)${desktopdir}
${INSTALL_DATA} ${srcdir}/etc/emacs.desktop \
$(DESTDIR)${desktopdir}/emacs.desktop
thisdir=`/bin/pwd` ; \
cd ${iconsrcdir} || exit 1; umask 022 ; \
for dir in */*/apps */*/mimetypes; do \
[ -d $${dir} ] || continue ; \
${MKDIR_P} ${icondir}/$${dir} ; \
( cd $${thisdir}; ${MKDIR_P} ${icondir}/$${dir} ) ; \
for icon in $${dir}/*.*; do \
[ -r $${icon} ] || continue ; \
${INSTALL_DATA} $${icon} ${icondir}/$${icon} || exit 1 ; \
( cd $${thisdir} ; \
${INSTALL_DATA} ${iconsrcdir}/$${icon} ${icondir}/$${icon} ) \
|| exit 1 ; \
done ; \
done
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment