diff options
| author | Sebastian Pipping <sping@gentoo.org> | 2013-03-02 12:58:21 +0100 |
|---|---|---|
| committer | Jon Lund Steffensen <jonlst@gmail.com> | 2013-03-02 12:58:21 +0100 |
| commit | 7346a69f6290be259b19a2cd47f3285ef7ffc433 (patch) | |
| tree | f7732517824c99af01ff12bd6e913b5129750355 | |
| parent | HACKING: Add further notes on testing python scripts. (diff) | |
| download | redshift-ng-7346a69f6290be259b19a2cd47f3285ef7ffc433.tar.gz redshift-ng-7346a69f6290be259b19a2cd47f3285ef7ffc433.tar.bz2 redshift-ng-7346a69f6290be259b19a2cd47f3285ef7ffc433.tar.xz | |
Makefile.am: Fix missing files when generating tarball.
With
$ ./configure --disable-gui
$ make dist
currently a tarball would be produced, that lacks the .desktop file.
That happens, because an empty variable is appended to EXTRA_DIST.
The attached patch ensures release tarballs with complete, consistent
content and at the same time makes sure that with --disable-gui no .svg
files are installed.
| -rw-r--r-- | Makefile.am | 42 |
1 files changed, 25 insertions, 17 deletions
diff --git a/Makefile.am b/Makefile.am index 0564869..b0e5c37 100644 --- a/Makefile.am +++ b/Makefile.am @@ -2,43 +2,51 @@ SUBDIRS = src po ACLOCAL_AMFLAGS = -I m4 -# Icons -hicolor_icondir = @datadir@/icons/hicolor/scalable/apps -hicolor_icon_DATA = data/icons/hicolor/scalable/apps/redshift.svg \ +_HICOLOR_FILES = \ + data/icons/hicolor/scalable/apps/redshift.svg \ data/icons/hicolor/scalable/apps/redshift-status-on.svg \ data/icons/hicolor/scalable/apps/redshift-status-off.svg -if ENABLE_UBUNTU -ubuntu_mono_dark_icondir = @datadir@/icons/ubuntu-mono-dark/scalable/apps -ubuntu_mono_dark_icon_DATA = \ +_UBUNTU_MONO_DARK_FILES = \ data/icons/ubuntu-mono-dark/scalable/apps/redshift-status-on.svg \ data/icons/ubuntu-mono-dark/scalable/apps/redshift-status-off.svg -ubuntu_mono_light_icondir = @datadir@/icons/ubuntu-mono-light/scalable/apps -ubuntu_mono_light_icon_DATA = \ +_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/gtk-redshift.desktop + +# Icons +if ENABLE_GUI +hicolor_icondir = @datadir@/icons/hicolor/scalable/apps +hicolor_icon_DATA = $(_HICOLOR_FILES) + +if ENABLE_UBUNTU +ubuntu_mono_dark_icondir = @datadir@/icons/ubuntu-mono-dark/scalable/apps +ubuntu_mono_dark_icon_DATA = $(_UBUNTU_MONO_DARK_FILES) + +ubuntu_mono_light_icondir = @datadir@/icons/ubuntu-mono-light/scalable/apps +ubuntu_mono_light_icon_DATA = $(_UBUNTU_MONO_LIGHT_FILES) +endif endif # Desktop file if ENABLE_GUI desktopdir = @datadir@/applications -desktop_DATA = data/applications/gtk-redshift.desktop +desktop_DATA = $(_DESKTOP_FILES) endif # man page dist_man1_MANS = redshift.1 EXTRA_DIST = \ - $(hicolor_icon_DATA) \ - $(desktop_DATA) - -if ENABLE_UBUNTU -EXTRA_DIST += \ - $(ubuntu_mono_dark_icon_DATA) \ - $(ubuntu_mono_light_icon_DATA) -endif + $(_HICOLOR_FILES) \ + $(_UBUNTU_MONO_DARK_FILES) \ + $(_UBUNTU_MONO_LIGHT_FILES) \ + $(_DESKTOP_FILES) # Update PO translations .PHONY: update-po |