diff options
| author | Glenn Morris <rgm@gnu.org> | 2012-05-17 15:30:42 -0400 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2012-05-17 15:30:42 -0400 |
| commit | 904769baa934f6d2febd59195633ce6bc12710ff (patch) | |
| tree | 9be4831a70db1132c9d09ade8b2efd890dd00ddf | |
| parent | d9a1e2c25f0508de7a83ef8879d2779c274a6afa (diff) | |
| download | emacs-904769baa934f6d2febd59195633ce6bc12710ff.tar.gz | |
* 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.
| -rw-r--r-- | Makefile.in | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/Makefile.in b/Makefile.in index 0649d2fee45..d2a8db90854 100644 --- a/Makefile.in +++ b/Makefile.in @@ -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 |