diff options
-rw-r--r-- | addressbook/ChangeLog | 7 | ||||
-rw-r--r-- | addressbook/gui/component/Makefile.am | 2 | ||||
-rw-r--r-- | addressbook/gui/contact-editor/Makefile.am | 1 | ||||
-rw-r--r-- | addressbook/gui/contact-list-editor/Makefile.am | 1 |
4 files changed, 7 insertions, 4 deletions
diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog index ef25e97f7a..81e2f5eece 100644 --- a/addressbook/ChangeLog +++ b/addressbook/ChangeLog @@ -1,3 +1,10 @@ +2003-01-24 Ettore Perazzoli <ettore@ximian.com> + + * gui/component/Makefile.am (iconsdir): Remove definition; this is + now in configure.in. + * gui/contact-editor/Makefile.am (iconsdir): Likewise. + * gui/contact-list-editor/Makefile.am (iconsdir): Likewise. + 2003-01-23 Sean Gao <Sean.Gao@Sun.COM> [ fixes bug #34898 ] diff --git a/addressbook/gui/component/Makefile.am b/addressbook/gui/component/Makefile.am index 3645f8756d..f831c19c6e 100644 --- a/addressbook/gui/component/Makefile.am +++ b/addressbook/gui/component/Makefile.am @@ -98,8 +98,6 @@ $(server_in_files:.server.in.in=.server.in): $(server_in_files) gladedir = $(datadir)/evolution-$(BASE_VERSION)/glade glade_DATA = ldap-config.glade -iconsdir = $(datadir)/evolution-$(BASE_VERSION)/images - EXTRA_DIST = \ $(glade_DATA) \ $(schema_DATA) \ diff --git a/addressbook/gui/contact-editor/Makefile.am b/addressbook/gui/contact-editor/Makefile.am index 38cf7e9da7..0b478a3479 100644 --- a/addressbook/gui/contact-editor/Makefile.am +++ b/addressbook/gui/contact-editor/Makefile.am @@ -52,7 +52,6 @@ MARSHAL_GENERATED = e-contact-editor-marshal.c e-contact-editor-marshal.h evolutiondir = $(datadir)/evolution-$(BASE_VERSION) evolution_DATA = arrow.png -iconsdir = $(datadir)/evolution-$(BASE_VERSION)/images gladedir = $(datadir)/evolution-$(BASE_VERSION)/glade glade_DATA = \ diff --git a/addressbook/gui/contact-list-editor/Makefile.am b/addressbook/gui/contact-list-editor/Makefile.am index 1e88a2978b..00805b0c09 100644 --- a/addressbook/gui/contact-list-editor/Makefile.am +++ b/addressbook/gui/contact-list-editor/Makefile.am @@ -45,7 +45,6 @@ e-contact-list-editor-marshal.c: e-contact-list-editor-marshal.h MARSHAL_GENERATED = e-contact-list-editor-marshal.c e-contact-list-editor-marshal.h -iconsdir = $(datadir)/evolution-$(BASE_VERSION)/images gladedir = $(datadir)/evolution-$(BASE_VERSION)/glade glade_DATA = \ |