[patch] Fix conditionals in Makefile.am

redshift-1.7-make-conditionals.patch (text/plain), 2.20 KB, created by Sebastian Pipping on 2012-07-20 22:26:40 UTC

--- Makefile.am	2012-07-20 22:52:27.013475104 +0200
+++ Makefile.am	2012-07-20 23:54:22.807021292 +0200
@@ -2,43 +2,51 @@
 SUBDIRS = src po
 ACLOCAL_AMFLAGS = -I m4
 
+_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
+
+_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_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 = 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
+hicolor_icon_DATA = $(_HICOLOR_FILES)
 
 if ENABLE_UBUNTU
 ubuntu_mono_dark_icondir = @datadir@/icons/ubuntu-mono-dark/scalable/apps
-ubuntu_mono_dark_icon_DATA = \
-	data/icons/ubuntu-mono-dark/scalable/apps/redshift-status-on.svg \
-	data/icons/ubuntu-mono-dark/scalable/apps/redshift-status-off.svg
+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 = \
-	data/icons/ubuntu-mono-light/scalable/apps/redshift-status-on.svg \
-	data/icons/ubuntu-mono-light/scalable/apps/redshift-status-off.svg
+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