diff options
| author | Stefan Schmidt <stefan@osg.samsung.com> | 2016-09-28 14:33:18 +0200 |
|---|---|---|
| committer | Stefan Schmidt <stefan@osg.samsung.com> | 2016-10-12 11:58:19 +0200 |
| commit | 3920950985f92a636a6488a5991a42309b2f32fb (patch) | |
| tree | 2f18cd8ab7d107e520ddad30572a84111a06044a | |
| parent | 8f80878fca50abde649c3dcd2dc07c6fc316eea2 (diff) | |
| download | efl-3920950985f92a636a6488a5991a42309b2f32fb.tar.gz | |
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.
| -rw-r--r-- | data/Makefile.am | 2 | ||||
| -rw-r--r-- | data/elementary/images/Makefile.am | 8 |
2 files changed, 1 insertions, 9 deletions
diff --git a/data/Makefile.am b/data/Makefile.am index 7ae6f30a78..03872bbafe 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -200,7 +200,7 @@ include elementary/images/Makefile.am elementaryimagesdir = $(datadir)/elementary/images elementaryimages_DATA = $(elementary_images_files) -elementaryimages_glayerdir = $(datadir)/elementary/images +elementaryimages_glayerdir = $(datadir)/elementary/images/g_layer elementaryimages_glayer_DATA = $(elementary_images_glayer_files) EXTRA_DIST += $(elementary_images_files) $(elementary_images_glayer_files) 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 = \ elementary/images/g_layer/flick_5.png \ elementary/images/g_layer/long_tap_5.png \ elementary/images/g_layer/tap_4.png - -elementary_images_filesdir = $(datadir)/elementary/images -elementary_images_files_DATA = $(elementary_images_files) - -elementary_images_glayer_filesdir = $(datadir)/elementary/images/g_layer -elementary_images_glayer_files_DATA = $(elementary_images_glayer_files) - -EXTRA_DIST += $(elementary_images_files_DATA) $(elementary_images_glayer_files_DATA) |