diff options
| author | Jon Lund Steffensen <jonlst@gmail.com> | 2010-06-30 20:10:12 +0200 |
|---|---|---|
| committer | Jon Lund Steffensen <jonlst@gmail.com> | 2010-06-30 20:10:12 +0200 |
| commit | 7db6532b9dcf1a311d6a333a9de9b95a1a12dd57 (patch) | |
| tree | 044fa6c91c5bfdd74b8a1bbc1b7c0c0b9863618d | |
| parent | Merge GUI autostart feature from Francesco Marella. (diff) | |
| download | redshift-ng-7db6532b9dcf1a311d6a333a9de9b95a1a12dd57.tar.gz redshift-ng-7db6532b9dcf1a311d6a333a9de9b95a1a12dd57.tar.bz2 redshift-ng-7db6532b9dcf1a311d6a333a9de9b95a1a12dd57.tar.xz | |
Move gtk-redshift.desktop file to data dir.
| -rw-r--r-- | Makefile.am | 11 | ||||
| -rw-r--r-- | configure.ac | 1 | ||||
| -rwxr-xr-x | data/applications/gtk-redshift.desktop (renamed from src/gtk-redshift/gtk-redshift.desktop) | 0 | ||||
| -rw-r--r-- | src/gtk-redshift/Makefile.am | 8 |
4 files changed, 11 insertions, 9 deletions
diff --git a/Makefile.am b/Makefile.am index c94f888..14335fa 100644 --- a/Makefile.am +++ b/Makefile.am @@ -15,10 +15,19 @@ ubuntu_mono_light_icondir = @datadir@/icons/ubuntu-mono-light/scalable/apps ubuntu_mono_light_icon_DATA = data/icons/ubuntu-mono-light/scalable/apps/redshift.svg \ data/icons/ubuntu-mono-light/scalable/apps/redshift-idle.svg + +# Desktop file +if ENABLE_GUI +desktopdir = @datadir@/applications +desktop_DATA = data/applications/gtk-redshift.desktop +endif + + EXTRA_DIST = \ $(hicolor_icon_DATA) \ $(ubuntu_mono_dark_icon_DATA) \ - $(ubuntu_mono_light_icon_DATA) + $(ubuntu_mono_light_icon_DATA) \ + $(desktop_DATA) # Update PO translations diff --git a/configure.ac b/configure.ac index fb29b91..15f67d1 100644 --- a/configure.ac +++ b/configure.ac @@ -171,6 +171,7 @@ AS_IF([test "x$enable_gui" != xappindicator -a "x$enable_gui" != xstatusicon], [ AC_MSG_RESULT([$enable_gui]) +AM_CONDITIONAL([ENABLE_GUI], [test "x$enable_gui" != xnone]) AM_CONDITIONAL([ENABLE_STATUSICON], [test "x$enable_gui" = xstatusicon]) AM_CONDITIONAL([ENABLE_APPINDICATOR], [test "x$enable_gui" = xappindicator]) diff --git a/src/gtk-redshift/gtk-redshift.desktop b/data/applications/gtk-redshift.desktop index 850255c..850255c 100755 --- a/src/gtk-redshift/gtk-redshift.desktop +++ b/data/applications/gtk-redshift.desktop diff --git a/src/gtk-redshift/Makefile.am b/src/gtk-redshift/Makefile.am index 42647f7..5896f1b 100644 --- a/src/gtk-redshift/Makefile.am +++ b/src/gtk-redshift/Makefile.am @@ -10,10 +10,6 @@ nodist_gtk_redshift_PYTHON = \ gtk_redshiftdir = $(pythondir)/gtk_redshift bin_SCRIPTS = gtk-redshift - -# Desktop file -desktopdir = ${datadir}/applications -desktop_DATA = gtk-redshift.desktop endif if ENABLE_APPINDICATOR @@ -27,10 +23,6 @@ nodist_gtk_redshift_PYTHON = \ gtk_redshiftdir = $(pythondir)/gtk_redshift bin_SCRIPTS = gtk-redshift - -# Desktop file -desktopdir = ${datadir}/applications -desktop_DATA = gtk-redshift.desktop endif EXTRA_DIST = gtk-redshift.in \ |