From 74f1ef06d302e2f5b0c048e3249bd6f3fc7e5922 Mon Sep 17 00:00:00 2001
From: tomo <tomo>
Date: Mon, 17 May 1999 09:41:39 +0000
Subject: [PATCH] XEmacs 21.2.6

---
 CHANGES-beta            |    9 +++++++++
 ChangeLog               |    4 ++++
 Makefile.in.in          |    7 ++-----
 PROBLEMS                |    5 +++++
 configure.in            |    2 +-
 dynodump/Makefile.in.in |    2 +-
 version.sh              |    4 ++--
 7 files changed, 24 insertions(+), 9 deletions(-)

diff --git a/CHANGES-beta b/CHANGES-beta
index 374f448..cc2d7c0 100644
--- a/CHANGES-beta
+++ b/CHANGES-beta
@@ -1,5 +1,14 @@
 							-*- indented-text -*-
+to 21.2 beta6 "Apollo"
+-- mswindows compile fixes from Martin Buchholz, Andy Piper, Greg
+   Klanderman and Adrian Aichner
+-- Synch with XEmacs 21.0.60
+-- mega-patch fixes from Martin Buchholz
+-- md5 fixes and testsuite from Hrvoje Niksic
+-- database fix from Hrvoje Niksic
+
 to 21.2 beta5 "Aphrodite"
+-- synch with XEmacs 21.0.58
 -- bytecode interpreter rewritten
 -- byte compiler fixes
 -- hash table implementation rewritten
diff --git a/ChangeLog b/ChangeLog
index c0da2f4..11f667a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+1998-12-16  Andy Piper  <andy@xemacs.org>
+
+	* XEmacs 21.2.6 is released
+
 1998-12-05  XEmacs Build Bot <builds@cvs.xemacs.org>
 
 	* XEmacs 21.2.5 is released
diff --git a/Makefile.in.in b/Makefile.in.in
index 5d6f4f2..d1002e1 100644
--- a/Makefile.in.in
+++ b/Makefile.in.in
@@ -534,11 +534,8 @@ clean: FRC.clean
 ##      distribution.
 top_distclean=\
 	$(RM) config.status config.log config-tmp-* build-install Installation ; \
-	for d in src lib-src lwlib dynodump ; do \
-	  $(RM) $$d/Makefile $$d/Makefile.in ; \
-	done ; \
-	$(RM) core .sbinit Makefile Makefile.in lock/*; \
-	$(RM) lisp/finder-inf.el* Installation.el Installation.elc; \
+	$(RM) core .sbinit lock/* GNUmakefile Makefile Makefile.in ; \
+	$(RM) lisp/finder-inf.el* Installation.el Installation.elc ; \
 	$(RM) packages mule-packages site-lisp
 
 distclean: FRC.distclean
diff --git a/PROBLEMS b/PROBLEMS
index aa65af5..da815d4 100644
--- a/PROBLEMS
+++ b/PROBLEMS
@@ -30,6 +30,11 @@ A general advice:
 ===============================
 
 ** General
+*** egcs-1.1
+
+There have been reports of egcs-1.1 not compiling XEmacs correctly on
+Alpha Linux.  There have also been reports that egcs-1.0.3a is O.K.
+
 *** Don't use -O2 with gcc 2.7.2 under Intel/XXX without also using
 `-fno-strength-reduce'.
 
diff --git a/configure.in b/configure.in
index 9b815df..8802a9b 100644
--- a/configure.in
+++ b/configure.in
@@ -3668,7 +3668,7 @@ for dir in $MAKE_SUBDIR; do
       done ) ;;
    * ) test -d "$dir" || mkdir "$dir" ;;
   esac
-  XE_SPACE(SUBDIR_MAKEFILES, $SUBDIR_MAKEFILES $dir/Makefile)
+  XE_SPACE(SUBDIR_MAKEFILES, $SUBDIR_MAKEFILES $dir/Makefile $dir/GNUmakefile)
   XE_SPACE(internal_makefile_list, $internal_makefile_list $dir/Makefile.in)
 done
 AC_SUBST(INSTALL_ARCH_DEP_SUBDIR)
diff --git a/dynodump/Makefile.in.in b/dynodump/Makefile.in.in
index b98e2a9..d400da1 100644
--- a/dynodump/Makefile.in.in
+++ b/dynodump/Makefile.in.in
@@ -80,7 +80,7 @@ mostlyclean:
 clean: mostlyclean
 	$(RM) *.so *.so.1
 distclean: clean
-	$(RM) Makefile Makefile.in TAGS
+	$(RM) GNUmakefile Makefile Makefile.in TAGS
 realclean: distclean
 extraclean: realclean
 	$(RM) *~ \#*
diff --git a/version.sh b/version.sh
index 097cc3e..814c3b1 100644
--- a/version.sh
+++ b/version.sh
@@ -1,8 +1,8 @@
 #!/bin/sh
 emacs_major_version=21
 emacs_minor_version=2
-emacs_beta_version=5
-xemacs_codename="Aphrodite"
+emacs_beta_version=6
+xemacs_codename="Apollo"
 infodock_major_version=4
 infodock_minor_version=0
 infodock_build_version=1
-- 
1.7.10.4