Generate the desktop files automatically.

6 files changed, 32 insertions, 36 deletions

diff --git a/Makefile.am b/Makefile.am
index af2981f..a767e48 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -10,6 +10,7 @@ bin_PROGRAMS =
 lib_LTLIBRARIES =
 noinst_LTLIBRARIES =
 include_HEADERS =
+dist_noinst_DATA =
 check_PROGRAMS =
 DISTCLEANFILES =
 CLEANFILES =
diff --git a/cfg.mk b/cfg.mk
index 3a39e45..bc2c511 100644
--- a/cfg.mk
+++ b/cfg.mk
@@ -1,7 +1,7 @@
 old_NEWS_hash = f0fb7934a30c4e89f0468433bd9317c7
 _makefile_at_at_check_exceptions = ' && !/INTL_MACOSX_LIBS/ && !/GSETTINGS_RULES/'
 
-generated_files = $(srcdir)/lib/*.[ch]
+generated_files = $(srcdir)/lib/*.[ch] $(srcdir)/desktop/*.desktop.in
 _gl_translatable_string_re ?= \b(N?_|gettext) *\([^)"]*("|$$)|translatable="yes"|^Comment=|<description>
 
 .PHONY: push-updated-translations sc_git_authors_known sc_appstream_news_hash
diff --git a/desktop/Makefile.am b/desktop/Makefile.am
index b7e9836..1197563 100644
--- a/desktop/Makefile.am
+++ b/desktop/Makefile.am
@@ -1,16 +1,21 @@
 desktopdir = $(datadir)/applications
-dist_desktop_DATA =
+desktop_DATA = \
+  %D%/eu.planete_kraus.Disfluid$(DISFLUID_NIGHTLY_SUFFIX).desktop
+
+dist_noinst_DATA += \
+  %D%/eu.planete_kraus.Disfluid.desktop \
+  %D%/eu.planete_kraus.Disfluid.Devel.desktop
+
 EXTRA_DIST += \
   %D%/eu.planete_kraus.Disfluid.desktop.in \
-  %D%/eu.planete_kraus.Disfluid.Devel.desktop.in
+  %D%/eu.planete_kraus.Disfluid.Devel.desktop.in \
+  %D%/eu.planete_kraus.Disfluid.desktop.in.in
 
-if DISFLUID_IS_NIGHTLY
-dist_desktop_DATA += \
-  %D%/eu.planete_kraus.Disfluid.Devel.desktop
-else
-dist_desktop_DATA += \
-  %D%/eu.planete_kraus.Disfluid.desktop
-endif
+%D%/eu.planete_kraus.Disfluid.desktop.in: %D%/eu.planete_kraus.Disfluid.desktop.in.in
+	$(AM_V_GEN) $(SED) 's/@''IF_NON_NIGHTLY''@//g;s/@''IF_NIGHTLY''@/# /g' $(srcdir)/%D%/eu.planete_kraus.Disfluid.desktop.in.in > %D%/eu.planete_kraus.Disfluid.desktop.in-t && mv %D%/eu.planete_kraus.Disfluid.desktop.in-t $(srcdir)/%D%/eu.planete_kraus.Disfluid.desktop.in
+
+%D%/eu.planete_kraus.Disfluid.Devel.desktop.in: %D%/eu.planete_kraus.Disfluid.desktop.in.in
+	$(AM_V_GEN) $(SED) 's/@''IF_NON_NIGHTLY''@/# /g;s/@''IF_NIGHTLY''@//g' $(srcdir)/%D%/eu.planete_kraus.Disfluid.desktop.in.in > %D%/eu.planete_kraus.Disfluid.Devel.desktop.in-t && mv %D%/eu.planete_kraus.Disfluid.Devel.desktop.in-t $(srcdir)/%D%/eu.planete_kraus.Disfluid.Devel.desktop.in
 
 %D%/eu.planete_kraus.Disfluid.desktop: %D%/eu.planete_kraus.Disfluid.desktop.in
 	$(AM_V_GEN) $(MSGFMT) --desktop --template=$(srcdir)/%D%/eu.planete_kraus.Disfluid.desktop.in -d $(srcdir)/po -o $(srcdir)/%D%/eu.planete_kraus.Disfluid.desktop
diff --git a/desktop/eu.planete_kraus.Disfluid.Devel.desktop.in b/desktop/eu.planete_kraus.Disfluid.Devel.desktop.in
deleted file mode 100644
index 144d533..0000000
--- a/desktop/eu.planete_kraus.Disfluid.Devel.desktop.in
+++ /dev/null
@@ -1,13 +0,0 @@
-[Desktop Entry]
-Name=Experiences (nightly)
-Comment=Share your experiences on the web, with more bugs
-Exec=disfluid %F
-Icon=eu.planete_kraus.Disfluid.Devel
-Type=Application
-Categories=Network
-DBusActivable=true
-MimeType=application/x-disfluid-cache-entry
-
-# Local Variables:
-# mode: conf-desktop
-# End:
diff --git a/desktop/eu.planete_kraus.Disfluid.desktop.in b/desktop/eu.planete_kraus.Disfluid.desktop.in
deleted file mode 100644
index f05c1e3..0000000
--- a/desktop/eu.planete_kraus.Disfluid.desktop.in
+++ /dev/null
@@ -1,13 +0,0 @@
-[Desktop Entry]
-Name=Experiences
-Comment=Share your experiences on the web
-Exec=disfluid %F
-Icon=eu.planete_kraus.Disfluid
-Type=Application
-Categories=Network
-DBusActivable=true
-MimeType=application/x-disfluid-cache-entry
-
-# Local Variables:
-# mode: conf-desktop
-# End:
diff --git a/desktop/eu.planete_kraus.Disfluid.desktop.in.in b/desktop/eu.planete_kraus.Disfluid.desktop.in.in
new file mode 100644
index 0000000..01caf36
--- /dev/null
+++ b/desktop/eu.planete_kraus.Disfluid.desktop.in.in
@@ -0,0 +1,16 @@
+[Desktop Entry]
+@IF_NON_NIGHTLY@Name=Experiences
+@IF_NIGHTLY@Name=Experiences (nightly)
+@IF_NON_NIGHTLY@Comment=Share your experiences on the web
+@IF_NIGHTLY@Comment=Share your experiences on the web with more bugs
+Exec=disfluid %F
+@IF_NON_NIGHTLY@Icon=eu.planete_kraus.Disfluid
+@IF_NIGHTLY@Icon=eu.planete_kraus.Disfluid.Devel
+Type=Application
+Categories=Network
+DBusActivable=true
+MimeType=application/x-disfluid-cache-entry
+
+# Local Variables:
+# mode: conf-desktop
+# End: