diff options
-rw-r--r-- | shell/ChangeLog | 5 | ||||
-rw-r--r-- | shell/Makefile.am | 4 |
2 files changed, 7 insertions, 2 deletions
diff --git a/shell/ChangeLog b/shell/ChangeLog index 0e845d6343..e500740bb6 100644 --- a/shell/ChangeLog +++ b/shell/ChangeLog @@ -1,5 +1,10 @@ 2001-06-29 Christopher James Lahey <clahey@ximian.com> + * Makefile.am (INCLUDES): Changed $(datadir)/evolution/etspec to + "$(etspecdir)" here. + +2001-06-29 Christopher James Lahey <clahey@ximian.com> + * e-shortcuts-view-model.c (load_group_into_model): Replaced GList with GSList here to fix a type mismatch. diff --git a/shell/Makefile.am b/shell/Makefile.am index 55a2700995..99effbd86c 100644 --- a/shell/Makefile.am +++ b/shell/Makefile.am @@ -7,10 +7,10 @@ INCLUDES = -O \ $(BONOBO_GNOME_CFLAGS) \ $(EXTRA_GNOME_CFLAGS) \ -DEVOLUTION_IMAGES=\""$(datadir)/images/evolution"\" \ - -DEVOLUTION_LOCALEDIR=\""$(localedir)"\" \ + -DEVOLUTION_LOCALEDIR=\""$(localedir)"\" \ -DEVOLUTION_DATADIR=\""$(datadir)"\" \ -DEVOLUTION_GLADEDIR=\"$(datadir)/evolution/glade\" \ - -DEVOLUTION_ETSPECDIR=\"$(datadir)/evolution/etspec\" \ + -DEVOLUTION_ETSPECDIR=\""$(etspecdir)"\" \ -DG_LOG_DOMAIN=\"evolution-shell\" # CORBA stuff |