From 06c11cc4c6473dcab0415a2e9f17c7a8dacb5894 Mon Sep 17 00:00:00 2001 From: Pierre-Luc Beaudoin Date: Sat, 6 Sep 2008 13:32:24 -0400 Subject: [PATCH] Fix image installation --- champlain/Makefile.am | 9 +- champlain/marker.svg | 271 ------------------------------------------ champlain/tile.c | 2 +- 3 files changed, 7 insertions(+), 275 deletions(-) delete mode 100644 champlain/marker.svg diff --git a/champlain/Makefile.am b/champlain/Makefile.am index c202638..b2d251a 100644 --- a/champlain/Makefile.am +++ b/champlain/Makefile.am @@ -27,8 +27,6 @@ libchamplain_1_0_la_SOURCES = $(CHAMPLAIN_MARSHAL_LIST) \ libchamplain_1_0_la_LIBADD = $(DEPS_LIBS) ../tidy/libtidy-1.0.la -EXTRA_DIST = $(CHAMPLAIN_MARSHAL_LIST) - champlain-marshal.h: $(CHAMPLAIN_MARSHAL_LIST) @GLIB_GENMARSHAL@ --header --prefix=champlain_marshal $< > $(CHAMPLAIN_MARSHAL).h @@ -42,7 +40,12 @@ libchamplain_1_0_la_LDFLAGS= -version-info $(LIBRARY_VERSION) noinst_PROGRAMS = launcher -AM_CPPFLAGS = $(DEPS_CFLAGS) -I../tidy +AM_CPPFLAGS = $(DEPS_CFLAGS) -DDATADIR=\""$(datadir)"\" -I../tidy AM_LDFLAGS = $(DEPS_LIBS) -export-dynamic -export-symbols-regex ^champlain_.* SOURCES = launcher.c LDADD = $(DEPS_LIBS) $(top_builddir)/champlain/libchamplain-1.0.la + +svgdir = $(datadir)/champlain +svg_DATA = error.svg + +EXTRA_DIST = $(svg_DATA) $(CHAMPLAIN_MARSHAL_LIST) diff --git a/champlain/marker.svg b/champlain/marker.svg deleted file mode 100644 index 426e2b4..0000000 --- a/champlain/marker.svg +++ /dev/null @@ -1,271 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - diff --git a/champlain/tile.c b/champlain/tile.c index bcc4ad9..40e5a92 100644 --- a/champlain/tile.c +++ b/champlain/tile.c @@ -56,7 +56,7 @@ tile_setup_animation(Tile* tile) static void create_error_tile(Map* map, Tile* tile) { - tile->actor = clutter_texture_new_from_file("error.svg", NULL); + tile->actor = clutter_texture_new_from_file(DATADIR "/champlain/error.svg", NULL); tile_set_position(map, tile); -- 2.39.5