diff options
| -rw-r--r-- | Makefile.am | 12 | ||||
| -rwxr-xr-x | bootstrap | 3 | ||||
| -rw-r--r-- | configure.ac | 1 | ||||
| -rwxr-xr-x | data/applications/redshift-gtk.desktop.in (renamed from data/applications/redshift-gtk.desktop) | 6 | ||||
| -rw-r--r-- | po/POTFILES.in | 2 |
5 files changed, 17 insertions, 7 deletions
diff --git a/Makefile.am b/Makefile.am index 675fda8..2743f62 100644 --- a/Makefile.am +++ b/Makefile.am @@ -26,8 +26,8 @@ _UBUNTU_MONO_LIGHT_FILES = \ data/icons/ubuntu-mono-light/scalable/apps/redshift-status-on.svg \ data/icons/ubuntu-mono-light/scalable/apps/redshift-status-off.svg -_DESKTOP_FILES = \ - data/applications/redshift-gtk.desktop +DESKTOP_IN_FILES = \ + data/applications/redshift-gtk.desktop.in SYSTEMD_USER_UNIT_IN_FILES = \ data/systemd/redshift.service.in \ @@ -52,7 +52,7 @@ endif # Desktop file if ENABLE_GUI desktopdir = @datadir@/applications -desktop_DATA = $(_DESKTOP_FILES) +desktop_DATA = $(DESKTOP_IN_FILES:.desktop.in=.desktop) endif if ENABLE_GUI @@ -61,6 +61,12 @@ install-data-hook: uninstall-hook: $(UPDATE_ICON_CACHE); + +# We would preferable use @INTLTOOL_DESKTOP_RULE@ here but +# sadly it is broken for out-of-tree builds. +%.desktop: %.desktop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) + $(AM_V_GEN)$(MKDIR_P) $(@D); + $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@ endif @@ -3,4 +3,5 @@ # change to root directory cd $(dirname "$0") -autoreconf --force --install +autopoint --force && \ + AUTOPOINT="intltoolize --automake --copy" autoreconf --force --install --verbose diff --git a/configure.ac b/configure.ac index deae0cf..173cf88 100644 --- a/configure.ac +++ b/configure.ac @@ -11,6 +11,7 @@ m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) # Checks for programs. AC_PROG_CC_C99 +AC_PROG_INTLTOOL([0.50]) # Checks for libraries. AM_GNU_GETTEXT_VERSION([0.17]) diff --git a/data/applications/redshift-gtk.desktop b/data/applications/redshift-gtk.desktop.in index dc8d8b2..f68bef6 100755 --- a/data/applications/redshift-gtk.desktop +++ b/data/applications/redshift-gtk.desktop.in @@ -1,8 +1,8 @@ [Desktop Entry] Version=1.0 -Name=Redshift -GenericName=Color temperature adjustment -Comment=Color temperature adjustment tool +_Name=Redshift +_GenericName=Color temperature adjustment +_Comment=Color temperature adjustment tool Exec=redshift-gtk Icon=redshift Terminal=false diff --git a/po/POTFILES.in b/po/POTFILES.in index 814d7ca..6abd07c 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -1,5 +1,7 @@ # List of source files containing translatable strings +data/applications/redshift-gtk.desktop.in + src/redshift.c src/config-ini.c |