aboutsummaryrefslogtreecommitdiffstats
path: root/calendar
diff options
context:
space:
mode:
Diffstat (limited to 'calendar')
-rw-r--r--calendar/ChangeLog7
-rw-r--r--calendar/conduits/calendar/Makefile.am2
-rw-r--r--calendar/gui/Makefile.am3
3 files changed, 9 insertions, 3 deletions
diff --git a/calendar/ChangeLog b/calendar/ChangeLog
index 914b0ae494..d3940936a1 100644
--- a/calendar/ChangeLog
+++ b/calendar/ChangeLog
@@ -1,3 +1,10 @@
+2000-07-10 Dan Winship <danw@helixcode.com>
+
+ * gui/Makefile.am (EXTRA_DIST): remove gnomecal.conduit
+
+ * conduits/calendar/Makefile.am (EXTRA_DIST): We want
+ calendar.conduit.in, not calendar.conduit.
+
2000-07-10 Seth Alves <alves@hungry.com>
* gui/Makefile.am (SUBDIRS):
diff --git a/calendar/conduits/calendar/Makefile.am b/calendar/conduits/calendar/Makefile.am
index 9f352ef02a..35ba864676 100644
--- a/calendar/conduits/calendar/Makefile.am
+++ b/calendar/conduits/calendar/Makefile.am
@@ -75,7 +75,7 @@ Conduitdir = $(datadir)/gnome-pilot/conduits/
Conduit_DATA = calendar.conduit
EXTRA_DIST = \
- $(Conduit_DATA) \
+ calendar.conduit.in \
$(ccenterConduits_DATA)
install-data-local:
diff --git a/calendar/gui/Makefile.am b/calendar/gui/Makefile.am
index 586a39139d..9ae3797de7 100644
--- a/calendar/gui/Makefile.am
+++ b/calendar/gui/Makefile.am
@@ -145,8 +145,7 @@ EXTRA_DIST = \
monthview.xpm \
yearview.xpm \
calendar-control.gnorba \
- calendar-control.oafinfo \
- gnomecal.conduit
+ calendar-control.oafinfo
install-data-local: