JMR-dev/redshift-rebooted
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Makefile.am: Fix missing files when generating tarball.

Browse Source 
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.
This commit is contained in:
Sebastian Pipping
2013-03-02 12:58:21 +01:00
committed by Jon Lund Steffensen
parent 64b6a0b2d6
commit 7346a69f62
1 changed files with 25 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Makefile.am
+25 -17
View File
@@ -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