From d19fb86208958012fe7d7ab9853e097b423015e4 Mon Sep 17 00:00:00 2001 From: David Trowbridge Date: Tue, 22 Mar 2005 17:10:37 +0000 Subject: Use $(weatherdatadir) rather than $(weatherdir), get rid of an incorrect 2005-03-22 David Trowbridge * Makefile.am: Use $(weatherdatadir) rather than $(weatherdir), get rid of an incorrect comment svn path=/trunk/; revision=29092 --- plugins/calendar-weather/ChangeLog | 5 +++++ plugins/calendar-weather/Makefile.am | 6 ++---- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/plugins/calendar-weather/ChangeLog b/plugins/calendar-weather/ChangeLog index 7e258910ad..3b6c2fdc79 100644 --- a/plugins/calendar-weather/ChangeLog +++ b/plugins/calendar-weather/ChangeLog @@ -1,3 +1,8 @@ +2005-03-22 David Trowbridge + + * Makefile.am: Use $(weatherdatadir) rather than $(weatherdir), get + rid of an incorrect comment + 2005-02-24 Björn Torkelsson * org-gnome-calendar-weather.eplug.in: Add a . to the end of description. diff --git a/plugins/calendar-weather/Makefile.am b/plugins/calendar-weather/Makefile.am index 67fe1bfb6a..f538d36314 100644 --- a/plugins/calendar-weather/Makefile.am +++ b/plugins/calendar-weather/Makefile.am @@ -1,18 +1,16 @@ eds_datadir = `pkg-config --variable=privdatadir evolution-data-server-1.2` +weatherdatadir = $(datadir)/evolution/$(BASE_VERSION)/weather INCLUDES = \ -I$(top_srcdir)/shell \ $(EVOLUTION_CFLAGS) \ $(EVOLUTION_CALENDAR_CFLAGS) \ $(SOURCE_SEL_CFLAGS) \ - -DWEATHER_DATADIR=\""$(weatherdir)"\" \ + -DWEATHER_DATADIR=\""$(weatherdatadir)"\" \ -DWEATHER_EDS_DATADIR=\""$(eds_datadir)/weather"\" @EVO_PLUGIN_RULE@ -# These will actually install into the e-d-s share directory, but -# if the plugin is disabled, we aren't going to be needing them. -weatherdatadir = $(datadir)/evolution/$(BASE_VERSION)/weather weatherdata_DATA = \ category_weather_cloudy_16.png \ category_weather_fog_16.png \ -- cgit