diff --git a/ChangeLog b/ChangeLog
index ce55801b0c..71dc3e36b6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+1999-10-20  Andreas Schwab  <schwab@suse.de>
+
+	* math/Makefile (libm-tests-generated): Remove libm-test.stmp.
+	(generated): Add it here.
+	(before-compile): Add libm-test.c.
+	($(addprefix $(objpfx), $(libm-tests-generated))): Depend on
+	libm-test.stmp.
+	($(objpfx)libm-test.stmp): Use $(objpfx) instead of
+	$(objdir)/math/.
+
 1999-10-31  Ulrich Drepper  <drepper@cygnus.com>
 
 	* Makefile (pdf): New goal.
diff --git a/manual/.cvsignore b/manual/.cvsignore
index 268ddb653d..f1254e92d3 100644
--- a/manual/.cvsignore
+++ b/manual/.cvsignore
@@ -4,7 +4,7 @@
 TODO COPYING* AUTHORS copyr-* copying.*
 glibc-*
 
-*.dvi* *.info* *.c.texi *.ps
+*.dvi* *.info* *.c.texi *.ps *.pdf
 *.toc *.aux *.log *.tmp
 *.cp *.cps *.fn *.fns *.vr *.vrs *.tp *.tps *.ky *.kys *.pg *.pgs
 
diff --git a/math/Makefile b/math/Makefile
index 8c326f2650..bc2e7b9307 100644
--- a/math/Makefile
+++ b/math/Makefile
@@ -88,14 +88,19 @@ libm-tests = test-float test-double $(test-longdouble-$(long-double-fcts)) \
 libm-tests.o = $(addsuffix .o,$(libm-tests))
 
 tests += $(libm-tests)
-libm-tests-generated = libm-test-ulps.h libm-test.c libm-test.stmp
-generated += $(libm-tests-generated)
+libm-tests-generated = libm-test-ulps.h libm-test.c
+generated += $(libm-tests-generated) libm-test.stmp
 
+# This is needed for dependencies
+before-compile += $(objpfx)libm-test.c
 
-ulps-file= $(firstword $(wildcard $(config-sysdirs:%=$(..)%/libm-test-ulps)))
+ulps-file = $(firstword $(wildcard $(config-sysdirs:%=$(..)%/libm-test-ulps)))
+
+$(addprefix $(objpfx), $(libm-tests-generated)): $(objpfx)libm-test.stmp
 
 $(objpfx)libm-test.stmp: $(ulps-file) libm-test.inc gen-libm-test.pl
-	$(PERL) gen-libm-test.pl -u $< -o $(objdir)/math/
+	$(make-target-directory)
+	$(PERL) gen-libm-test.pl -u $< -o "$(objpfx)"
 	@echo > $@
 
 $(objpfx)test-float.o: $(objpfx)libm-test.stmp