diff --git a/ChangeLog b/ChangeLog
index 2a281b38c5..159bd65c51 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,18 @@
+1998-01-08  Andreas Schwab  <schwab@issan.cs.uni-dortmund.de>
+
+	* manual/Makefile (stamp-summary): Remove space after -t option
+	for compatibility with non-GNU sort programs.
+
+1999-01-08  Andreas Schwab  <schwab@issan.cs.uni-dortmund.de>
+
+	* manual/search.texi (Comparison Functions): Fix compare_doubles
+	example.
+
+1999-01-07  Andreas Schwab  <schwab@issan.cs.uni-dortmund.de>
+
+	* Makerules (do-tests-clean): Remove reference to obsolete
+	variable tests-static.
+
 1999-01-07  Ulrich Drepper  <drepper@cygnus.com>
 
 	* sysdeps/unix/sysv/linux/ntp_adjtime.c: Removed.  It's an alias
diff --git a/Makerules b/Makerules
index 81c869352f..6bc796193f 100644
--- a/Makerules
+++ b/Makerules
@@ -884,8 +884,7 @@ clean: common-clean
 mostlyclean: common-mostlyclean
 
 do-tests-clean:
-	-rm -f $(addprefix $(objpfx),$(addsuffix .out,$(tests) $(test-srcs)) \
-				     $(addsuffix .sout,$(tests-static)))
+	-rm -f $(patsubst %,$(objpfx)%.out,$(tests) $(test-srcs))
 
 # Remove the object files.
 common-mostlyclean:
diff --git a/manual/Makefile b/manual/Makefile
index 7647cb89ba..e0dad4792c 100644
--- a/manual/Makefile
+++ b/manual/Makefile
@@ -1,4 +1,4 @@
-# Copyright (C) 1992, 93, 94, 95, 96, 97, 98 Free Software Foundation, Inc.
+# Copyright (C) 1992, 93, 94, 95, 96, 97, 98, 99 Free Software Foundation, Inc.
 # This file is part of the GNU C Library.
 
 # The GNU C Library is free software; you can redistribute it and/or
@@ -74,7 +74,7 @@ libc.dvi: texinfo.tex
 # Generate the summary from the Texinfo source files for each chapter.
 summary.texi: stamp-summary ;
 stamp-summary: summary.awk $(filter-out summary.texi, $(texis))
-	$(AWK) -f $^ | sort -t '' -df +0 -1 | tr '\014' '\012' > summary-tmp
+	$(AWK) -f $^ | sort -t'^L' -df +0 -1 | tr '\014' '\012' > summary-tmp
 	$(move-if-change) summary-tmp summary.texi
 	touch $@
 
diff --git a/manual/search.texi b/manual/search.texi
index b43153a44b..f561ef9e34 100644
--- a/manual/search.texi
+++ b/manual/search.texi
@@ -39,9 +39,12 @@ numbers of type @code{double}:
 
 @smallexample
 int
-compare_doubles (const double *a, const double *b)
+compare_doubles (const void *a, const void *b)
 @{
-  return (int) (*a - *b);
+  const double *da = (const double *) a;
+  const double *db = (const double *) b;
+
+  return (*da > *db) - (*da < *db);
 @}
 @end smallexample