GNOME Bugzilla – Bug 616159
Should try to get icons from EMPATHY_SRCDIR
Last modified: 2012-03-08 12:10:39 UTC
Empathy try to get its icons from PKGDATADIR/"icons". So when running from source, these icons are missing if we didn't "make install" as well. Empathy should try to get EMPATHY_SRCDIR when the variable is set so it will be run fine without being installed.
Created attachment 159063 [details] [review] http://git.collabora.co.uk/?p=user/cassidy/empathy;a=shortlog;h=refs/heads/icons-616159 data/.gitignore | 1 + data/icons/Makefile.am | 27 +++++++++++++++++++++++++++ libempathy-gtk/empathy-ui-utils.c | 9 +++++++++ 3 files changed, 37 insertions(+), 0 deletions(-)
Note that the icons are re-installed each time "make" is executed. If an autofoo guru could improve that to only run it when icons or Makefile has been changed that would be great.
I rebased the branch on top of master. It still works fine but I'd prefer to fix it to to re-install all the icons each time we run "make" before merging.
Created attachment 209098 [details] [review] "Build" a local copy of the icons to be used from sources
Created attachment 209099 [details] [review] empathy_gtk_init: add local copy of icons to the search path (#616159)
Created attachment 209150 [details] [review] Re-spin, this time generating icons only when needed. With a bit of GNU Make hackery generate a rule for each icon which will ensure that the destination stays up-to-date with the source. I've also changed the local installation path from ./data/icons/local-copy/icons to just ./data/icons/local-copy
Created attachment 209151 [details] [review] Re-spin, loading from ./data/icons/local-copy
Seems to work so if "make distcheck" still pass that's good for me.