diff options
Diffstat (limited to 'addressbook')
| -rw-r--r-- | addressbook/ChangeLog | 7 | ||||
| -rw-r--r-- | addressbook/Makefile.am | 6 |
2 files changed, 10 insertions, 3 deletions
diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog index 5d05f411c4..04778a1829 100644 --- a/addressbook/ChangeLog +++ b/addressbook/ChangeLog @@ -1,3 +1,10 @@ +2007-06-06 Nickolay V. Shmyrev <nshmyrev@yandex.ru> + + * Makefile.am: + + Reverted automake 1.6 breakage. Fixes bug 444747. + Patch by Patch by Daniel Gryniewicz <dang@nemesis.fprintf.net>. + 2007-06-03 Srinivasa Ragavan <sragavan@novell.com> ** Fix for bug #386503 from Matthew Barnes diff --git a/addressbook/Makefile.am b/addressbook/Makefile.am index 2ad82313ae..4ee593ecc6 100644 --- a/addressbook/Makefile.am +++ b/addressbook/Makefile.am @@ -1,10 +1,10 @@ -SUBDIRS = util printing importers gui tools - if ENABLE_PILOT_CONDUITS -SUBDIRS += conduit +CONDUIT_SUBDIR = conduit endif +SUBDIRS = util printing importers gui tools $(CONDUIT_SUBDIR) + error_DATA = addressbook.error errordir = $(privdatadir)/errors |