2 files changed, 16 insertions, 1 deletions

diff --git a/ChangeLog b/ChangeLog
index a4cef305560..fd6ce3dff0f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2014-08-28  Glenn Morris  <rgm@gnu.org>
+
+        * Makefile.in (appdatadir): New variable.
+        (install-etc, uninstall, clean): Handle etc/emacs.appdata.xml.
+
 2014-08-27  Paul Eggert  <eggert@cs.ucla.edu>
 
         Improve robustness of new string-collation code (Bug#18051).
diff --git a/Makefile.in b/Makefile.in
index a6080e5ce78..dee3f7167a1 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -179,6 +179,9 @@ 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)/appdata
+
 # Where the etc/images/icons/hicolor directory is to be installed.
 icondir=$(datarootdir)/icons
 
@@ -687,6 +690,12 @@ install-etc:
           ${srcdir}/etc/emacs.desktop > $${tmp}; \
         ${INSTALL_DATA} $${tmp} "$(DESTDIR)${desktopdir}/${EMACS_NAME}.desktop"; \
         rm -f $${tmp}
+        umask 022; ${MKDIR_P} "$(DESTDIR)${appdatadir}"
+        tmp=etc/emacs.tmpappdata; 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"; \
+        rm -f $${tmp}
         thisdir=`/bin/pwd`; \
         cd ${iconsrcdir} || exit 1; umask 022 ; \
         for dir in */*/apps */*/mimetypes; do \
@@ -751,6 +760,7 @@ uninstall: uninstall-$(NTDIR) uninstall-doc
              hicolor/scalable/mimetypes/`echo emacs-document | sed '$(TRANSFORM)'`.svg; \
         fi)
         -rm -f "$(DESTDIR)${desktopdir}/${EMACS_NAME}.desktop"
+        -rm -f "$(DESTDIR)${appdatadir}/${EMACS_NAME}.appdata.xml"
         for file in snake-scores tetris-scores; do \
           file="$(DESTDIR)${gamedir}/$${file}"; \
           [ -s "$${file}" ] || rm -f "$$file"; \
@@ -806,7 +816,7 @@ clean: $(clean_dirs:=_clean)
         for dir in test/automated; do \
           [ ! -d $$dir ] || $(MAKE) -C $$dir clean; \
         done
-        -rm -f etc/emacs.tmpdesktop
+        -rm -f etc/emacs.tmpdesktop etc/emacs.tmpappdata
 
 ### `bootclean'
 ###      Delete all files that need to be remade for a clean bootstrap.