aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--plugins/calendar-weather/ChangeLog5
-rw-r--r--plugins/calendar-weather/Makefile.am6
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 <trowbrds@cs.colorado.edu>
+
+ * Makefile.am: Use $(weatherdatadir) rather than $(weatherdir), get
+ rid of an incorrect comment
+
2005-02-24 Björn Torkelsson <torkel@acc.umu.se>
* 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 \