merged 745:746 from release branch

[[Imported from SVN: r747]]

doc/Makefile.am

@@ -20,8 +20,8 @@ doc_DATA = $(DOCS)
 CLEANFILES = *.aux *.bbl *.blg *.log *.out *.toc *.dvi *.pdf *.ps
 
 dist-hook:
-	cp $(srcdir)/Makefile.dist.am $(distdir)/Makefile.am
-	cp $(srcdir)/Makefile.dist.in $(distdir)/Makefile.in
+	sed $(srcdir)/Makefile.dist.am -e 's/Makefile\.dist/Makefile/g' > $(distdir)/Makefile.am
+	sed $(srcdir)/Makefile.dist.in -e 's/Makefile\.dist/Makefile/g' > $(distdir)/Makefile.in
 
 include $(top_srcdir)/am/latex
 include $(top_srcdir)/am/webstuff

doc/Makefile.dist.am

@@ -6,6 +6,8 @@ docdir=$(datadir)/doc/dune-istl
 
 doc_DATA = istl.pdf
 
+CONFIG_CLEAN_FILES = *.dist
+
 include $(top_srcdir)/am/latex
 include $(top_srcdir)/am/webstuff
 include $(top_srcdir)/am/global-rules

doc/comm/Makefile.am

@@ -40,8 +40,8 @@ communication.dvi : communication.tex buildindexset.hh reverse.hh
 CLEANFILES = *.aux *.bbl *.blg *.log *.out *.toc *.dvi *.pdf *.ps
 
 dist-hook:
-	cp $(srcdir)/Makefile.dist.am $(distdir)/Makefile.am
-	cp $(srcdir)/Makefile.dist.in  $(distdir)/Makefile.in
+	sed $(srcdir)/Makefile.dist.am -e 's/Makefile\.dist/Makefile/g' > $(distdir)/Makefile.am
+	sed $(srcdir)/Makefile.dist.in -e 's/Makefile\.dist/Makefile/g' > $(distdir)/Makefile.in
 
 include $(top_srcdir)/am/latex
 include $(top_srcdir)/am/webstuff

doc/comm/Makefile.dist.am

@@ -11,6 +11,8 @@ commdir=$(datadir)/doc/dune-istl/comm
 
 comm_DATA = communication.pdf
 
+CONFIG_CLEAN_FILES = *.dist
+
 include $(top_srcdir)/am/latex
 include $(top_srcdir)/am/webstuff
 include $(top_srcdir)/am/global-rules