]> git.eshelyaron.com Git - emacs.git/commitdiff
Add install/uninstall rules for etc/emacs.appdata.xml
authorGlenn Morris <rgm@gnu.org>
Thu, 28 Aug 2014 02:02:18 +0000 (19:02 -0700)
committerGlenn Morris <rgm@gnu.org>
Thu, 28 Aug 2014 02:02:18 +0000 (19:02 -0700)
* Makefile.in (appdatadir): New variable.
(install-etc, uninstall, clean): Handle etc/emacs.appdata.xml.

ChangeLog
Makefile.in

index a4cef305560812b58cf0c9efa5699ee5a288878e..fd6ce3dff0f02b926c7722baf09cbd1180942cc1 100644 (file)
--- 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).
index a6080e5ce78feed604b28adc02d57ba4a4f2b2c9..dee3f7167a10eed8e20863c1ef5ee572d3eacac7 100644 (file)
@@ -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.