diff options
| author | Glenn Morris <rgm@gnu.org> | 2012-10-15 16:56:07 -0400 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2012-10-15 16:56:07 -0400 |
| commit | 1a9c683079f638f251eee7a17f9c6ae369d30ef7 (patch) | |
| tree | bd01b62158a9304970409a1545bb0aac90b217f1 /Makefile.in | |
| parent | 8599b23a90cf10e7308a59dbf9197d8e4c439ee2 (diff) | |
| download | emacs-1a9c683079f638f251eee7a17f9c6ae369d30ef7.tar.gz | |
Apply program-transform-name etc in more places (bug#12536#34)
* Makefile.in (install-man, install-etc): Apply $TRANSFORM.
(clean): Delete etc/emacs.tmpdesktop.
* .bzrignore: Add etc/emacs.tmpdesktop.
* etc/NEWS: Mention this. Unrelated copyedits.
Diffstat (limited to 'Makefile.in')
| -rw-r--r-- | Makefile.in | 20 |
1 files changed, 14 insertions, 6 deletions
diff --git a/Makefile.in b/Makefile.in index 571013e3244..95f851b0ada 100644 --- a/Makefile.in +++ b/Makefile.in @@ -622,18 +622,24 @@ install-man: thisdir=`/bin/pwd`; \ cd ${mansrcdir}; \ for page in *.1; do \ + dest=`echo "$${page}" | sed '$(TRANSFORM)'`; \ (cd $${thisdir}; \ - ${INSTALL_DATA} ${mansrcdir}/$${page} $(DESTDIR)${man1dir}/$${page}); \ + ${INSTALL_DATA} ${mansrcdir}/$${page} $(DESTDIR)${man1dir}/$${dest}); \ ( [ -n "${GZIP_INFO}" ] && [ -n "${GZIP_PROG}" ] ) || continue ; \ - rm -f $(DESTDIR)${man1dir}/$${page}.gz; \ - ${GZIP_PROG} -9n $(DESTDIR)${man1dir}/$${page}; \ + rm -f $(DESTDIR)${man1dir}/$${dest}.gz; \ + ${GZIP_PROG} -9n $(DESTDIR)${man1dir}/$${dest}; \ done ## Install those items from etc/ that need to end up elsewhere. install-etc: umask 022; ${MKDIR_P} $(DESTDIR)${desktopdir} - ${INSTALL_DATA} ${srcdir}/etc/emacs.desktop \ - $(DESTDIR)${desktopdir}/emacs.desktop + dest=`echo emacs | sed '$(TRANSFORM)'`; \ + tmp=etc/emacs.tmpdesktop; rm -f $${tmp}; \ + sed -e "/^Exec=emacs/ s/emacs/$${dest}/" \ + -e "/^Icon=emacs/ s/emacs/$${dest}/" \ + ${srcdir}/etc/emacs.desktop > $${tmp}; \ + ${INSTALL_DATA} $${tmp} $(DESTDIR)${desktopdir}/$${dest}.desktop; \ + rm -f $${tmp} thisdir=`/bin/pwd`; \ cd ${iconsrcdir} || exit 1; umask 022 ; \ for dir in */*/apps */*/mimetypes; do \ @@ -641,8 +647,9 @@ install-etc: ( cd $${thisdir}; ${MKDIR_P} $(DESTDIR)${icondir}/$${dir} ) ; \ for icon in $${dir}/*.*; do \ [ -r $${icon} ] || continue ; \ + dest=`echo "$${icon}" | sed '$(TRANSFORM)'` ; \ ( cd $${thisdir}; \ - ${INSTALL_DATA} ${iconsrcdir}/$${icon} $(DESTDIR)${icondir}/$${icon} ) \ + ${INSTALL_DATA} ${iconsrcdir}/$${icon} $(DESTDIR)${icondir}/$${dest} ) \ || exit 1; \ done ; \ done @@ -729,6 +736,7 @@ mostlyclean: FRC ### ### Delete `.dvi' files here if they are not part of the distribution. clean: FRC + -rm -f etc/emacs.tmpdesktop (cd src; $(MAKE) $(MFLAGS) clean) (cd oldXMenu; $(MAKE) $(MFLAGS) clean) (cd lwlib; $(MAKE) $(MFLAGS) clean) |