aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--tools/Makefile.am6
2 files changed, 7 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 441a531661..1432c780e4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2001-10-19 Dan Winship <danw@ximian.com>
+
+ * tools/Makefile.am (EXTRA_DIST): Merge the two EXTRA_DIST
+ declarations together so they both happen.
+
2001-10-18 Chris Toshok <toshok@ximian.com>
* tools/killev: use a new fangled perl script that queries oaf for
diff --git a/tools/Makefile.am b/tools/Makefile.am
index 4b5516d28f..eee5a29499 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -1,9 +1,6 @@
bin_SCRIPTS = killev evolution-move-tasks evolution-addressbook-clean
bin_PROGRAMS = evolution-addressbook-import evolution-addressbook-export
-EXTRA_DIST = \
- evolution-addressbook-clean.in
-
INCLUDES = \
-DG_LOG_DOMAIN=\"evolution-tools\" \
$(EXTRA_GNOME_CFLAGS) \
@@ -15,7 +12,8 @@ INCLUDES = \
-DEVOLUTION_LOCALEDIR=\""$(localedir)"\" \
-I$(top_srcdir)/addressbook
-EXTRA_DIST = $(bin_SCRIPTS) verify-evolution-install.sh
+EXTRA_DIST = $(bin_SCRIPTS) verify-evolution-install.sh \
+ evolution-addressbook-clean.in
evolution_addressbook_import_LDADD = \
$(EXTRA_GNOME_LIBS) \