Merge from emacs--devo--0

Patches applied:

 * emacs--devo--0  (patch 490-504)

   - Update from CVS
   - Merge from gnus--rel--5.10

 * gnus--rel--5.10  (patch 161-163)

   - Update from CVS
   - Merge from emacs--devo--0

Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-130

1 files changed, 3 insertions, 0 deletions

diff --git a/make-dist b/make-dist
index a6674fed187..df27155d813 100755
--- a/make-dist
+++ b/make-dist
@@ -638,6 +638,7 @@ echo "Making links to \`info'"
 echo "Making links to \`man'"
 (cd man
  ln *.texi *.aux *.cps *.fns *.kys *.vrs ../${tempdir}/man
+ ln makefile.w32-in ../${tempdir}/man
  test -f README && ln README ../${tempdir}/man
  test -f Makefile.in && ln Makefile.in ../${tempdir}/man
  ln ChangeLog ../${tempdir}/man
@@ -652,6 +653,7 @@ echo "Making links to \`lispref'"
  ln `ls -1 *.texi` ../${tempdir}/lispref
  ln *.aux *.cps *.fns *.kys *.vrs ../${tempdir}/lispref
  ln *.txt *.el spellfile tindex.pl ../${tempdir}/lispref
+ ln makefile.w32-in ../${tempdir}/lispref
  test -f README && ln README ../${tempdir}/lispref
  test -f Makefile.in && ln Makefile.in ../${tempdir}/lispref
  ln ChangeLog ../${tempdir}/lispref
@@ -662,6 +664,7 @@ echo "Making links to \`lispref'"
 echo "Making links to \`lispintro'"
 (cd lispintro
  ln *.texi *.aux *.cps *.fns *.kys *.vrs *.eps ../${tempdir}/lispintro
+ ln makefile.w32-in ../${tempdir}/lispintro
  test -f texinfo.tex && ln texinfo.tex ../${tempdir}/lispintro
  test -f README && ln README ../${tempdir}/lispintro
  test -f Makefile.in && ln Makefile.in ../${tempdir}/lispintro