- After merge fixes

BitKeeper/deleted/.del-Do-compile~d1a6d7e535befea3:
  Auto merged
BitKeeper/deleted/.del-Makefile.am~8eda4336dfcaefc:
  Auto merged
BitKeeper/deleted/.del-mysqld_error.txt~95f167eb567c789d:
  Auto merged
scripts/Makefile.am:
  Auto merged
scripts/make_win_src_distribution.sh:
  Auto merged
BitKeeper/deleted/.del-texi2html~74632fe370dcec73:
  Auto merged
configure.in:
  - manual merge
support-files/mysql.spec.sh:
  - manual merge

support-files/mysql.spec.sh

@@ -363,11 +363,6 @@ fi
 (cd libmysql/.libs; tar cf $RBR/shared-libs.tar *.so*)
 (cd libmysql_r/.libs; tar rf $RBR/shared-libs.tar *.so*)
 
-# Save manual to avoid rebuilding
-mv Docs/manual.ps Docs/manual.ps.save
-make clean
-mv Docs/manual.ps.save Docs/manual.ps
-
 #
 # Only link statically on our i386 build host (which has a specially
 # patched static glibc installed) - ia64 and x86_64 run glibc-2.3 (unpatched)
@@ -535,8 +530,6 @@ fi
 %defattr(-,root,root,0755)
 
 %doc COPYING README 
-%doc Docs/manual.{html,ps,texi,txt}
-%doc Docs/manual_toc.html
 %doc support-files/my-*.cnf
 %doc support-files/ndb-*.ini
 
@@ -691,7 +684,12 @@ fi
 # The spec file changelog only includes changes made to the spec file
 # itself - note that they must be ordered by date (important when
 # merging BK trees)
-%changelog
+%changelog 
+* Wed Apr 13 2005 Lenz Grimmer <lenz@mysql.com>
+
+- removed the MySQL manual files (html/ps/texi) - they have been removed
+  from the MySQL sources and are now available seperately.
+
 * Mon Apr 4 2005 Petr Chardin <petr@mysql.com>
 
 - old mysqlmanager, mysqlmanagerc and mysqlmanager-pwger renamed into