aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--addressbook/ChangeLog5
-rw-r--r--addressbook/Makefile.am4
2 files changed, 6 insertions, 3 deletions
diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog
index e712f9dba7..11e118d214 100644
--- a/addressbook/ChangeLog
+++ b/addressbook/ChangeLog
@@ -1,3 +1,8 @@
+2003-01-26 Chris Toshok <toshok@ximian.com>
+
+ * Makefile.am (CONDUIT_SUBDIR): enable this, as building the
+ conduit works if you have gnome-pilot2.
+
2003-01-25 Chris Toshok <toshok@ximian.com>
* conduit/address-conduit.c: GObjectify the stuff in here that
diff --git a/addressbook/Makefile.am b/addressbook/Makefile.am
index b220599a94..2580fd4519 100644
--- a/addressbook/Makefile.am
+++ b/addressbook/Makefile.am
@@ -1,7 +1,5 @@
if ENABLE_PILOT_CONDUITS
-# PENDING_PORT_WORK
-# CONDUIT_SUBDIR=conduit
-CONDUIT_SUBDIR=
+CONDUIT_SUBDIR=conduit
endif
SUBDIRS = \