diff options
| author | Yuuki Harano <masm+github@masm11.me> | 2021-05-29 18:00:13 +0900 |
|---|---|---|
| committer | Yuuki Harano <masm+github@masm11.me> | 2021-05-29 18:00:13 +0900 |
| commit | 67ae4b6271233559271f7a7158ba0e059b643ba5 (patch) | |
| tree | 9ceee3c99afb42b252ac11116cc31163acaaeb40 /Makefile.in | |
| parent | 67a4c8b5ad9ebfb3fa2c7fae433aa6b6b5e92154 (diff) | |
| parent | e3fc16fd71a46990503a71b11a2ad592e99d9edb (diff) | |
| download | emacs-67ae4b6271233559271f7a7158ba0e059b643ba5.tar.gz | |
Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs into feature/pgtk
Diffstat (limited to 'Makefile.in')
| -rw-r--r-- | Makefile.in | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/Makefile.in b/Makefile.in index 71f761eb40f..2aba179b090 100644 --- a/Makefile.in +++ b/Makefile.in @@ -185,8 +185,8 @@ x_default_search_path=@x_default_search_path@ # Where the etc/emacs.desktop file is to be installed. desktopdir=$(datarootdir)/applications -# Where the etc/emacs.appdata.xml file is to be installed. -appdatadir=$(datarootdir)/metainfo +# Where the etc/emacs.metainfo.xml file is to be installed. +metainfodir=$(datarootdir)/metainfo # Where the etc/emacs.service file is to be installed. # The system value (typically /usr/lib/systemd/user) can be @@ -728,11 +728,11 @@ install-etc: ${srcdir}/etc/emacsclient.desktop > $${tmp}; \ ${INSTALL_DATA} $${tmp} "$(DESTDIR)${desktopdir}/$${client_name}.desktop"; \ rm -f $${tmp} - umask 022; ${MKDIR_P} "$(DESTDIR)${appdatadir}" - tmp=etc/emacs.tmpappdata; rm -f $${tmp}; \ + umask 022; ${MKDIR_P} "$(DESTDIR)${metainfodir}" + tmp=etc/emacs.tmpmetainfo; rm -f $${tmp}; \ sed -e "s/emacs\.desktop/${EMACS_NAME}.desktop/" \ - ${srcdir}/etc/emacs.appdata.xml > $${tmp}; \ - ${INSTALL_DATA} $${tmp} "$(DESTDIR)${appdatadir}/${EMACS_NAME}.appdata.xml"; \ + ${srcdir}/etc/emacs.metainfo.xml > $${tmp}; \ + ${INSTALL_DATA} $${tmp} "$(DESTDIR)${metainfodir}/${EMACS_NAME}.metainfo.xml"; \ rm -f $${tmp} umask 022; $(MKDIR_P) "$(DESTDIR)$(systemdunitdir)" tmp=etc/emacs.tmpservice; rm -f $${tmp}; \ @@ -818,7 +818,7 @@ uninstall: uninstall-$(NTDIR) uninstall-doc uninstall-gsettings-schemas "hicolor/scalable/mimetypes/${EMACS_NAME}-document23.svg"; \ fi) -rm -f "$(DESTDIR)${desktopdir}/${EMACS_NAME}.desktop" - -rm -f "$(DESTDIR)${appdatadir}/${EMACS_NAME}.appdata.xml" + -rm -f "$(DESTDIR)${metainfodir}/${EMACS_NAME}.metainfo.xml" -rm -f "$(DESTDIR)$(systemdunitdir)/${EMACS_NAME}.service" ifneq (,$(use_gamedir)) for file in snake-scores tetris-scores; do \ |