From 2c445af1247951fb2947d833e97814ecfeb85616 Mon Sep 17 00:00:00 2001 From: Eskil Heyn Olsen Date: Thu, 23 Sep 1999 05:58:40 +0000 Subject: better merge of summary/description when doing ical_from_remote * calendar-conduit.c: better merge of summary/description when doing ical_from_remote (update_record), also handles import from gnomecal to pilot better, and on both ways, repeat events are much better now. svn path=/trunk/; revision=1253 --- calendar/Makefile.am | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'calendar/Makefile.am') diff --git a/calendar/Makefile.am b/calendar/Makefile.am index ed17a8aa6c..90aa6c628b 100644 --- a/calendar/Makefile.am +++ b/calendar/Makefile.am @@ -9,9 +9,10 @@ gnorba_DATA = gnomecal.gnorba help_base = $(datadir)/gnome/help/cal if HAVE_GNOME_PILOT -EXTRA_PROGRAMS = todo-conduit-control-applet calendar-conduit-control-applet -endif +bin_PROGRAMS = gnomecal todo-conduit-control-applet calendar-conduit-control-applet +else bin_PROGRAMS = gnomecal +endif INCLUDES = \ -I$(includedir) \ -- cgit