[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] trunk r117756: Add install/uninstall rules for etc/emacs.a
From: |
Glenn Morris |
Subject: |
[Emacs-diffs] trunk r117756: Add install/uninstall rules for etc/emacs.appdata.xml |
Date: |
Thu, 28 Aug 2014 02:02:24 +0000 |
User-agent: |
Bazaar (2.6b2) |
------------------------------------------------------------
revno: 117756
revision-id: address@hidden
parent: address@hidden
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Wed 2014-08-27 19:02:18 -0700
message:
Add install/uninstall rules for etc/emacs.appdata.xml
* Makefile.in (appdatadir): New variable.
(install-etc, uninstall, clean): Handle etc/emacs.appdata.xml.
modified:
ChangeLog changelog-20091113204419-o5vbwnq5f7feedwu-1538
Makefile.in makefile.in-20091113204419-o5vbwnq5f7feedwu-446
=== modified file 'ChangeLog'
--- a/ChangeLog 2014-08-28 01:59:29 +0000
+++ b/ChangeLog 2014-08-28 02:02:18 +0000
@@ -1,3 +1,8 @@
+2014-08-28 Glenn Morris <address@hidden>
+
+ * Makefile.in (appdatadir): New variable.
+ (install-etc, uninstall, clean): Handle etc/emacs.appdata.xml.
+
2014-08-27 Paul Eggert <address@hidden>
Improve robustness of new string-collation code (Bug#18051).
=== modified file 'Makefile.in'
--- a/Makefile.in 2014-07-13 15:50:35 +0000
+++ b/Makefile.in 2014-08-28 02:02:18 +0000
@@ -179,6 +179,9 @@
# 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 @@
${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 @@
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 @@
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.
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] trunk r117756: Add install/uninstall rules for etc/emacs.appdata.xml,
Glenn Morris <=