aboutsummaryrefslogtreecommitdiffstats
path: root/calendar
diff options
context:
space:
mode:
Diffstat (limited to 'calendar')
-rw-r--r--calendar/ChangeLog4
-rw-r--r--calendar/gui/Makefile.am6
2 files changed, 9 insertions, 1 deletions
diff --git a/calendar/ChangeLog b/calendar/ChangeLog
index 04809350c2..e036b7ecbf 100644
--- a/calendar/ChangeLog
+++ b/calendar/ChangeLog
@@ -1,3 +1,7 @@
+2000-06-02 Christopher James Lahey <clahey@helixcode.com>
+
+ * gui/Makefile.am: Fixed EXTRA_DIST.
+
2000-06-01 Federico Mena Quintero <federico@helixcode.com>
* gui/gnome-cal.c (editor_closed_cb): Handler for the
diff --git a/calendar/gui/Makefile.am b/calendar/gui/Makefile.am
index 3344908f2a..6da0812b23 100644
--- a/calendar/gui/Makefile.am
+++ b/calendar/gui/Makefile.am
@@ -104,6 +104,7 @@ evolution_calendar_LDADD = \
evolution_calendar_LDFLAGS = `gnome-config --libs gdk_pixbuf`
+
if USING_OAF
oafdir = $(datadir)/oaf
oaf_DATA = calendar-control.oafinfo evolution-calendar.oafinfo
@@ -112,7 +113,9 @@ gnorbadir = $(sysconfdir)/CORBA/servers
gnorba_DATA = calendar-control.gnorba evolution-calendar.gnorba
endif
-EXTRA_DIST = \
+OAF_GNORBA_EXTRAS = calendar-control.oafinfo evolution-calendar.oafinfo calendar-control.gnorba evolution-calendar.gnorba
+EXTRA_DIST = \
+ $(OAF_GNORBA_EXTRAS) \
$(glade_DATA) \
bell.xpm \
recur.xpm \
@@ -124,6 +127,7 @@ EXTRA_DIST = \
calendar-control.gnorba \
calendar-control.oafinfo
+
install-data-local:
$(mkinstalldirs) $(DESTDIR)$(help_base)/C