[mess-desktop-entries] Rework @MESS@ variable substitution.
- From: Matthew Barnes <mbarnes src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [mess-desktop-entries] Rework @MESS@ variable substitution.
- Date: Wed, 23 Feb 2011 19:50:47 +0000 (UTC)
commit 7d7dd0a67eac06c2fc293034a8a9da80a0f7de19
Author: Matthew Barnes <mbarnes redhat com>
Date: Wed Feb 23 13:57:44 2011 -0500
Rework @MESS@ variable substitution.
Substitute @MESS@ at install-time using an install-data-hook rule.
Makefile.am | 23 ++++++++++++-------
configure.ac | 9 -------
mess-dc.desktop.in.in => mess-dc.desktop.in | 0
...ameboy.desktop.in.in => mess-gameboy.desktop.in | 0
mess-gba.desktop.in.in => mess-gba.desktop.in | 0
...enesis.desktop.in.in => mess-genesis.desktop.in | 0
mess-msx.desktop.in.in => mess-msx.desktop.in | 0
mess-n64.desktop.in.in => mess-n64.desktop.in | 0
mess-nes.desktop.in.in => mess-nes.desktop.in | 0
mess-sms.desktop.in.in => mess-sms.desktop.in | 0
mess-snes.desktop.in.in => mess-snes.desktop.in | 0
po/POTFILES.skip | 13 -----------
12 files changed, 14 insertions(+), 31 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 4c04c25..5aa25c9 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -4,18 +4,23 @@ SUBDIRS = po
desktopdir = $(datadir)/applications
desktop_in_files = \
- mess-dc.desktop.in \
- mess-gameboy.desktop.in \
- mess-gba.desktop.in \
- mess-genesis.desktop.in \
- mess-msx.desktop.in \
- mess-n64.desktop.in \
- mess-nes.desktop.in \
- mess-sms.desktop.in \
- mess-snes.desktop.in
+ mess-dc.desktop.in \
+ mess-gameboy.desktop.in \
+ mess-gba.desktop.in \
+ mess-genesis.desktop.in \
+ mess-msx.desktop.in \
+ mess-n64.desktop.in \
+ mess-nes.desktop.in \
+ mess-sms.desktop.in \
+ mess-snes.desktop.in
desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
@INTLTOOL_DESKTOP_RULE@
+install-data-hook:
+ for file in $(desktop_DATA); do \
+ sed -i "s|\ MESS\@|$(MESS)|" $(DESTDIR)$(desktopdir)/$$file; \
+ done
+
EXTRA_DIST = $(desktop_in_files)
DISTCLEANFILES = $(desktop_DATA)
diff --git a/configure.ac b/configure.ac
index fad1026..8a5c13e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -47,15 +47,6 @@ AC_SUBST(GETTEXT_PACKAGE)
AC_CONFIG_FILES([
Makefile
- mess-dc.desktop.in
- mess-gameboy.desktop.in
- mess-gba.desktop.in
- mess-genesis.desktop.in
- mess-msx.desktop.in
- mess-n64.desktop.in
- mess-nes.desktop.in
- mess-sms.desktop.in
- mess-snes.desktop.in
po/Makefile.in
])
AC_OUTPUT
diff --git a/mess-dc.desktop.in.in b/mess-dc.desktop.in
similarity index 100%
rename from mess-dc.desktop.in.in
rename to mess-dc.desktop.in
diff --git a/mess-gameboy.desktop.in.in b/mess-gameboy.desktop.in
similarity index 100%
rename from mess-gameboy.desktop.in.in
rename to mess-gameboy.desktop.in
diff --git a/mess-gba.desktop.in.in b/mess-gba.desktop.in
similarity index 100%
rename from mess-gba.desktop.in.in
rename to mess-gba.desktop.in
diff --git a/mess-genesis.desktop.in.in b/mess-genesis.desktop.in
similarity index 100%
rename from mess-genesis.desktop.in.in
rename to mess-genesis.desktop.in
diff --git a/mess-msx.desktop.in.in b/mess-msx.desktop.in
similarity index 100%
rename from mess-msx.desktop.in.in
rename to mess-msx.desktop.in
diff --git a/mess-n64.desktop.in.in b/mess-n64.desktop.in
similarity index 100%
rename from mess-n64.desktop.in.in
rename to mess-n64.desktop.in
diff --git a/mess-nes.desktop.in.in b/mess-nes.desktop.in
similarity index 100%
rename from mess-nes.desktop.in.in
rename to mess-nes.desktop.in
diff --git a/mess-sms.desktop.in.in b/mess-sms.desktop.in
similarity index 100%
rename from mess-sms.desktop.in.in
rename to mess-sms.desktop.in
diff --git a/mess-snes.desktop.in.in b/mess-snes.desktop.in
similarity index 100%
rename from mess-snes.desktop.in.in
rename to mess-snes.desktop.in
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]