kimcinoo
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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
8dcd5207cc 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.
This commit is contained in:
Stefan Schmidt 2016-09-28 14:33:18 +02:00
parent ceb63bb202
commit ce97a042e3
2 changed files with 1 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
data/Makefile.am
View File

@ -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)

8
data/elementary/images/Makefile.am
View File

@ -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)