Pull up fix from the branch:

	builddir != srcdir fix for building the calendar, executive summary
	and importer developers' docs.

svn path=/trunk/; revision=9408

10 files changed, 30 insertions, 14 deletions

diff --git a/doc/devel/ChangeLog b/doc/devel/ChangeLog
index d00a1df434..cda1fe6953 100644
--- a/doc/devel/ChangeLog
+++ b/doc/devel/ChangeLog
@@ -1,3 +1,11 @@
+2001-04-17  Ettore Perazzoli  <ettore@ximian.com>
+
+	* calendar/cal-client/Makefile.am (install-data-local): Install
+	the $(DOC_DIR_INSTALL_FILES) from the srcdir.
+	* calendar/cal-util/Makefile.am (install-data-local): Likewise.
+	* importer/Makefile.am (install-data-local): Likewise.
+	* executive-summary/Makefile.am (install-data-local): Likewise.
+
 2001-01-26  John R. Sheets  <dusk@ravendusk.org>
 
 	* importer/Makefile.am: Change (nonexistant) importer.sgml
diff --git a/doc/devel/calendar/cal-client/Makefile.am b/doc/devel/calendar/cal-client/Makefile.am
index f3a2b39ec6..9e02b21f9b 100644
--- a/doc/devel/calendar/cal-client/Makefile.am
+++ b/doc/devel/calendar/cal-client/Makefile.am
@@ -117,8 +117,8 @@ maintainer-clean-local: clean
 
 install-data-local:
 	$(mkinstalldirs) $(DOC_DIR)
-	for i in $(DOC_DIR_INSTALL_FILES); do		\
-		$(INSTALL_DATA) $$i $(DOC_DIR);		\
+	for i in $(DOC_DIR_INSTALL_FILES); do		  \
+		$(INSTALL_DATA) $(srcdir)/$$i $(DOC_DIR); \
 	done
 
 dist-hook:
diff --git a/doc/devel/calendar/cal-util/Makefile.am b/doc/devel/calendar/cal-util/Makefile.am
index 7f567652ef..227fbb1a9c 100644
--- a/doc/devel/calendar/cal-util/Makefile.am
+++ b/doc/devel/calendar/cal-util/Makefile.am
@@ -129,7 +129,7 @@ maintainer-clean-local: clean
 install-data-local:
 	$(mkinstalldirs) $(DOC_DIR)
 	for i in $(DOC_DIR_INSTALL_FILES); do		\
-		$(INSTALL_DATA) $$i $(DOC_DIR);		\
+		$(INSTALL_DATA) $(srcdir)/$$i $(DOC_DIR);		\
 	done
 
 dist-hook:
diff --git a/doc/devel/executive-summary/Makefile.am b/doc/devel/executive-summary/Makefile.am
index 9aa53af4ec..38664929d8 100644
--- a/doc/devel/executive-summary/Makefile.am
+++ b/doc/devel/executive-summary/Makefile.am
@@ -34,7 +34,7 @@ SOURCE_FILES =							\
 
 IGNORED_HEADER_FILES =		\
 	Executive-Summary.h
-	
+
 scan_generated =						\
 	evolution-services-decl.txt			\
 	evolution-services.args				\
@@ -111,8 +111,8 @@ maintainer-clean-local: clean
 
 install-data-local:
 	$(mkinstalldirs) $(DOC_DIR)
-	for i in $(DOC_DIR_INSTALL_FILES); do		\
-		$(INSTALL_DATA) $$i $(DOC_DIR);		\
+	for i in $(DOC_DIR_INSTALL_FILES); do			\
+		$(INSTALL_DATA) $(srcdir)/$$i $(DOC_DIR);	\
 	done
 
 dist-hook:
diff --git a/doc/devel/importer/Makefile.am b/doc/devel/importer/Makefile.am
index ef3b2b98ee..571d05e58a 100644
--- a/doc/devel/importer/Makefile.am
+++ b/doc/devel/importer/Makefile.am
@@ -114,7 +114,7 @@ maintainer-clean-local: clean
 install-data-local:
 	$(mkinstalldirs) $(DOC_DIR)
 	for i in $(DOC_DIR_INSTALL_FILES); do		\
-		$(INSTALL_DATA) $$i $(DOC_DIR);		\
+		$(INSTALL_DATA) $(srcdir)/$$i $(DOC_DIR);		\
 	done
 
 dist-hook:
diff --git a/help/devel/ChangeLog b/help/devel/ChangeLog
index d00a1df434..cda1fe6953 100644
--- a/help/devel/ChangeLog
+++ b/help/devel/ChangeLog
@@ -1,3 +1,11 @@
+2001-04-17  Ettore Perazzoli  <ettore@ximian.com>
+
+	* calendar/cal-client/Makefile.am (install-data-local): Install
+	the $(DOC_DIR_INSTALL_FILES) from the srcdir.
+	* calendar/cal-util/Makefile.am (install-data-local): Likewise.
+	* importer/Makefile.am (install-data-local): Likewise.
+	* executive-summary/Makefile.am (install-data-local): Likewise.
+
 2001-01-26  John R. Sheets  <dusk@ravendusk.org>
 
 	* importer/Makefile.am: Change (nonexistant) importer.sgml
diff --git a/help/devel/calendar/cal-client/Makefile.am b/help/devel/calendar/cal-client/Makefile.am
index f3a2b39ec6..9e02b21f9b 100644
--- a/help/devel/calendar/cal-client/Makefile.am
+++ b/help/devel/calendar/cal-client/Makefile.am
@@ -117,8 +117,8 @@ maintainer-clean-local: clean
 
 install-data-local:
 	$(mkinstalldirs) $(DOC_DIR)
-	for i in $(DOC_DIR_INSTALL_FILES); do		\
-		$(INSTALL_DATA) $$i $(DOC_DIR);		\
+	for i in $(DOC_DIR_INSTALL_FILES); do		  \
+		$(INSTALL_DATA) $(srcdir)/$$i $(DOC_DIR); \
 	done
 
 dist-hook:
diff --git a/help/devel/calendar/cal-util/Makefile.am b/help/devel/calendar/cal-util/Makefile.am
index 7f567652ef..227fbb1a9c 100644
--- a/help/devel/calendar/cal-util/Makefile.am
+++ b/help/devel/calendar/cal-util/Makefile.am
@@ -129,7 +129,7 @@ maintainer-clean-local: clean
 install-data-local:
 	$(mkinstalldirs) $(DOC_DIR)
 	for i in $(DOC_DIR_INSTALL_FILES); do		\
-		$(INSTALL_DATA) $$i $(DOC_DIR);		\
+		$(INSTALL_DATA) $(srcdir)/$$i $(DOC_DIR);		\
 	done
 
 dist-hook:
diff --git a/help/devel/executive-summary/Makefile.am b/help/devel/executive-summary/Makefile.am
index 9aa53af4ec..38664929d8 100644
--- a/help/devel/executive-summary/Makefile.am
+++ b/help/devel/executive-summary/Makefile.am
@@ -34,7 +34,7 @@ SOURCE_FILES =							\
 
 IGNORED_HEADER_FILES =		\
 	Executive-Summary.h
-	
+
 scan_generated =						\
 	evolution-services-decl.txt			\
 	evolution-services.args				\
@@ -111,8 +111,8 @@ maintainer-clean-local: clean
 
 install-data-local:
 	$(mkinstalldirs) $(DOC_DIR)
-	for i in $(DOC_DIR_INSTALL_FILES); do		\
-		$(INSTALL_DATA) $$i $(DOC_DIR);		\
+	for i in $(DOC_DIR_INSTALL_FILES); do			\
+		$(INSTALL_DATA) $(srcdir)/$$i $(DOC_DIR);	\
 	done
 
 dist-hook:
diff --git a/help/devel/importer/Makefile.am b/help/devel/importer/Makefile.am
index ef3b2b98ee..571d05e58a 100644
--- a/help/devel/importer/Makefile.am
+++ b/help/devel/importer/Makefile.am
@@ -114,7 +114,7 @@ maintainer-clean-local: clean
 install-data-local:
 	$(mkinstalldirs) $(DOC_DIR)
 	for i in $(DOC_DIR_INSTALL_FILES); do		\
-		$(INSTALL_DATA) $$i $(DOC_DIR);		\
+		$(INSTALL_DATA) $(srcdir)/$$i $(DOC_DIR);		\
 	done
 
 dist-hook: