From edb8dc5eb3a29fbc4ffc98be37c21e03a3bef6ab Mon Sep 17 00:00:00 2001 From: Rodney Dawes Date: Thu, 3 Feb 2005 16:35:12 +0000 Subject: Use $(weatherdir) instead of duplicating the define for it below 2005-02-02 Rodney Dawes * Makefile.am (INCLUDES): Use $(weatherdir) instead of duplicating the define for it below (weatherdir): Fix to use the correct versioned directory svn path=/trunk/; revision=28691 --- plugins/calendar-weather/ChangeLog | 6 ++++++ plugins/calendar-weather/Makefile.am | 4 ++-- 2 files changed, 8 insertions(+), 2 deletions(-) (limited to 'plugins/calendar-weather') diff --git a/plugins/calendar-weather/ChangeLog b/plugins/calendar-weather/ChangeLog index dd96d99f03..f7a0045ea5 100644 --- a/plugins/calendar-weather/ChangeLog +++ b/plugins/calendar-weather/ChangeLog @@ -1,3 +1,9 @@ +2005-02-02 Rodney Dawes + + * Makefile.am (INCLUDES): Use $(weatherdir) instead of duplicating the + define for it below + (weatherdir): Fix to use the correct versioned directory + 2005-01-26 David Trowbridge * org-gnome-calendar-weather.eplug.in: fix typo diff --git a/plugins/calendar-weather/Makefile.am b/plugins/calendar-weather/Makefile.am index ef4e0a0b7b..67fe1bfb6a 100644 --- a/plugins/calendar-weather/Makefile.am +++ b/plugins/calendar-weather/Makefile.am @@ -5,14 +5,14 @@ INCLUDES = \ $(EVOLUTION_CFLAGS) \ $(EVOLUTION_CALENDAR_CFLAGS) \ $(SOURCE_SEL_CFLAGS) \ - -DWEATHER_DATADIR=\""$(datadir)/evolution-$(BASE_VERSION)/weather"\" \ + -DWEATHER_DATADIR=\""$(weatherdir)"\" \ -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 +weatherdatadir = $(datadir)/evolution/$(BASE_VERSION)/weather weatherdata_DATA = \ category_weather_cloudy_16.png \ category_weather_fog_16.png \ -- cgit v1.2.3