3 files changed, 16 insertions, 5 deletions
diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog
index 959ebfe279..9b394de644 100644
--- a/addressbook/ChangeLog
+++ b/addressbook/ChangeLog
@@ -1,3 +1,14 @@
+2001-09-14  Ettore Perazzoli  <ettore@ximian.com>
+
+	[Automake 1.5 fixes pointed out by Richard Boulton
+	<richard@tartarus.org>, as per #9258.]
+
+	* backend/pas/Makefile.am: Rename `LDAP_BACKEND_SOURCES' to
+	`LDAP_BACKEND_FILES'.
+
+	* backend/ebook/Makefile.am: Set CLEANFILES directly instead of
+	using `+='.
+
 2001-09-13  Chris Toshok  <toshok@ximian.com>
 
 	* backend/pas/pas-backend-ldap.c (pas_backend_ldap_connect): use
diff --git a/addressbook/backend/ebook/Makefile.am b/addressbook/backend/ebook/Makefile.am
index 37a940d515..c2bcbe7c75 100644
--- a/addressbook/backend/ebook/Makefile.am
+++ b/addressbook/backend/ebook/Makefile.am
@@ -164,7 +164,7 @@ load_gnomecard_addressbook_LDADD =			\
 
 
 BUILT_SOURCES = $(CORBA_SOURCE)
-CLEANFILES   += $(BUILT_SOURCES)
+CLEANFILES    = $(BUILT_SOURCES)
 
 dist-hook:
 	cd $(distdir); rm -f $(BUILT_SOURCES)
diff --git a/addressbook/backend/pas/Makefile.am b/addressbook/backend/pas/Makefile.am
index 399ca2956a..d5f4813d8d 100644
--- a/addressbook/backend/pas/Makefile.am
+++ b/addressbook/backend/pas/Makefile.am
@@ -23,10 +23,10 @@ INCLUDES =						\
         $(BONOBO_GNOME_CFLAGS)				\
 	$(EXTRA_GNOME_CFLAGS)
 
-LDAP_BACKEND_SOURCES = pas-backend-ldap.c pas-backend-ldap.h
+LDAP_BACKEND_FILES = pas-backend-ldap.c pas-backend-ldap.h
 
 if ENABLE_LDAP
-LDAP_BACKEND = $(LDAP_BACKEND_SOURCES)
+LDAP_BACKEND = $(LDAP_BACKEND_FILES)
 else
 LDAP_BACKEND = 
 endif
@@ -52,9 +52,9 @@ libpas_a_SOURCES =					\
 	pas-card-cursor.h
 
 BUILT_SOURCES = $(CORBA_SOURCE)
-CLEANFILES   += $(BUILT_SOURCES)
+CLEANFILES = $(BUILT_SOURCES)
 
 dist-hook:
 	cd $(distdir); rm -f $(BUILT_SOURCES)
 
-EXTRA_DIST = $(LDAP_BACKEND_SOURCES)
+EXTRA_DIST = $(LDAP_BACKEND_FILES)