summaryrefslogtreecommitdiff
path: root/data/elementary/images
diff options
context:
space:
mode:
authorStefan Schmidt <stefan@osg.samsung.com>2016-09-28 14:33:18 +0200
committerStefan Schmidt <stefan@osg.samsung.com>2016-09-28 14:33:18 +0200
commitce97a042e3e5ccea474ca4501f3d5f5a3b2f2deb (patch)
treec9345b571d62f5a2ab5b35ab42d6848b4361c1ad /data/elementary/images
parentceb63bb202c46889e53ea030493656698271016f (diff)
data: elm: images: fix double data file definitions leading to races
For a while now I had strange races during make install on Jenkins where some image files either already existed or chmod was called on files not there yet. It took some digging but it turns out commit 8dcd5207cc61e604efc942a62137bdeda4060aa0 broke this as a side effect. The black magic that already installed the files JP refers to is sitting in data/Makefile.am. It is plain autofoo stuff and just includes the images Makefile to get the list of files. JP was correct though that the glayer files have not been installed into the correct subdir. Fixing this as well here.
Diffstat (limited to 'data/elementary/images')
-rw-r--r--data/elementary/images/Makefile.am8
1 files changed, 0 insertions, 8 deletions
diff --git a/data/elementary/images/Makefile.am b/data/elementary/images/Makefile.am
index 5c0f0eb22a..9909d82abe 100644
--- a/data/elementary/images/Makefile.am
+++ b/data/elementary/images/Makefile.am
@@ -88,11 +88,3 @@ elementary_images_glayer_files = \
88 elementary/images/g_layer/flick_5.png \ 88 elementary/images/g_layer/flick_5.png \
89 elementary/images/g_layer/long_tap_5.png \ 89 elementary/images/g_layer/long_tap_5.png \
90 elementary/images/g_layer/tap_4.png 90 elementary/images/g_layer/tap_4.png
91
92elementary_images_filesdir = $(datadir)/elementary/images
93elementary_images_files_DATA = $(elementary_images_files)
94
95elementary_images_glayer_filesdir = $(datadir)/elementary/images/g_layer
96elementary_images_glayer_files_DATA = $(elementary_images_glayer_files)
97
98EXTRA_DIST += $(elementary_images_files_DATA) $(elementary_images_glayer_files_DATA)