4 files changed, 32 insertions, 15 deletions
diff --git a/Build/source/texk/dvipsk/ChangeLog b/Build/source/texk/dvipsk/ChangeLog
index 4b19c1f757e..2ff5d9b8705 100644
--- a/Build/source/texk/dvipsk/ChangeLog
+++ b/Build/source/texk/dvipsk/ChangeLog
@@ -1,3 +1,12 @@
+2013-01-21  Karl Berry  <karl@tug.org>
+
+	* test-dvips: rename from dvips.test, to avoid new Automake 1.13
+	make check failure, since it can't create dvips.log in the
+	event that dvips.log already exists (from running dvips.texi).
+	Even though one is in the srcdir and one in the builddir ...
+	Use test-dvips rather than dvips-test just to help filename completion.
+	* Makefile.am (TESTS): rename.
+
 2013-01-18  Karl Berry  <karl@tug.org>
 
 	* writet1.c: apply diffs (cast removals) from pdftex.
diff --git a/Build/source/texk/dvipsk/Makefile.am b/Build/source/texk/dvipsk/Makefile.am
index 8b9bffcdfac..0305946e637 100644
--- a/Build/source/texk/dvipsk/Makefile.am
+++ b/Build/source/texk/dvipsk/Makefile.am
@@ -1,6 +1,6 @@
 ## Makefile.am for the TeX Live subdirectory texk/dvipsk/
 ##
-## Copyright (C) 2009-2012 Peter Breitenlohner <tex-live@tug.org>
+## Copyright (C) 2009-2013 Peter Breitenlohner <tex-live@tug.org>
 ## You may freely use, modify and/or distribute this file.
 ##
 ACLOCAL_AMFLAGS = -I ../../m4
@@ -110,8 +110,8 @@ CLEANFILES = $(prologues) texc.lpro
 
 ## dvips tests
 TESTS = afm2tfm-test.pl
-TESTS += beginfontk1.test dvips.test eepic-nan.test \
-         pfbincl.test quotecmd-test.pl
+TESTS += beginfontk1.test eepic-nan.test \
+         pfbincl.test quotecmd-test.pl test-dvips
 
 TESTS_ENVIRONMENT = TEXMFCNF=$(srcdir)/../kpathsea
 TESTS_ENVIRONMENT += TEXCONFIG=$(srcdir)/testdata
@@ -153,9 +153,6 @@ DISTCLEANFILES += afmtest.tfm
 ## beginfontk1.test
 EXTRA_DIST += testdata/beginfontk1.dvi testdata/beginfontk1.eps testdata/beginfontk1.tex
 DISTCLEANFILES += beginfontk1.ps
-## dvips.test
-EXTRA_DIST += testdata/dvipstst.tex testdata/dvipstst.xdv testdata/dvipstst.xps
-DISTCLEANFILES += dvipstst.ps missfont.log mtest.ps
 ## eepic-nan.test
 EXTRA_DIST += testdata/eepic-nan.dvi testdata/eepic-nan.tex
 DISTCLEANFILES += eepic-nan.ps
@@ -165,6 +162,9 @@ DISTCLEANFILES += pfbincl.ps
 ## quotecmd-test.pl
 EXTRA_DIST += testdata/quotecmd.dvi testdata/quotecmd.tex 
 DISTCLEANFILES += *badnews*
+## test-dvips
+EXTRA_DIST += testdata/dvipstst.tex testdata/dvipstst.xdv testdata/dvipstst.xps
+DISTCLEANFILES += dvipstst.ps missfont.log mtest.ps
 
 EXTRA_DIST += \
 	NEWS \
diff --git a/Build/source/texk/dvipsk/Makefile.in b/Build/source/texk/dvipsk/Makefile.in
index 190004ad831..28e73a045bf 100644
--- a/Build/source/texk/dvipsk/Makefile.in
+++ b/Build/source/texk/dvipsk/Makefile.in
@@ -652,8 +652,9 @@ LDADD = $(KPATHSEA_LIBS)
 dist_man1_MANS = afm2tfm.1 dvips.1
 info_TEXINFOS = dvips.texi
 dvips_TEXINFOS = contrib/config.proto dvips.help
-DISTCLEANFILES = $(DVIS) $(PSS) afmtest.tfm beginfontk1.ps dvipstst.ps \
-	missfont.log mtest.ps eepic-nan.ps pfbincl.ps *badnews*
+DISTCLEANFILES = $(DVIS) $(PSS) afmtest.tfm beginfontk1.ps \
+	eepic-nan.ps pfbincl.ps *badnews* dvipstst.ps missfont.log \
+	mtest.ps
 prolog_DATA = $(prologues)
 dist_prologues = \
 	color.lpro \
@@ -678,11 +679,11 @@ EXTRA_DIST = $(dist_prologues) texc.script $(TESTS) testdata/8r.enc \
 	testdata/special.pro testdata/tex.pro testdata/texc.pro \
 	testdata/texps.pro testdata/beginfontk1.dvi \
 	testdata/beginfontk1.eps testdata/beginfontk1.tex \
-	testdata/dvipstst.tex testdata/dvipstst.xdv \
-	testdata/dvipstst.xps testdata/eepic-nan.dvi \
-	testdata/eepic-nan.tex testdata/pfbincl.eps \
-	testdata/pfbincl.tex testdata/pfbincl.xdv testdata/pfbincl.xps \
-	testdata/quotecmd.dvi testdata/quotecmd.tex NEWS TODO \
+	testdata/eepic-nan.dvi testdata/eepic-nan.tex \
+	testdata/pfbincl.eps testdata/pfbincl.tex testdata/pfbincl.xdv \
+	testdata/pfbincl.xps testdata/quotecmd.dvi \
+	testdata/quotecmd.tex testdata/dvipstst.tex \
+	testdata/dvipstst.xdv testdata/dvipstst.xps NEWS TODO \
 	testdata/intoverflow.dvi testdata/vfnameoverflow.dvi atari \
 	cmfonts.map config.ps contrib/PSTricks contrib/afm-extra \
 	contrib/colorsep.lpro contrib/configs contrib/crop.lpr \
@@ -691,8 +692,8 @@ EXTRA_DIST = $(dist_prologues) texc.script $(TESTS) testdata/8r.enc \
 	flib.c hps/CHANGES_HPS.txt hps/README_HPS.txt lafonts.map \
 	makefont.c mvs psfonts.map tex vmcms vms
 CLEANFILES = $(prologues) texc.lpro
-TESTS = afm2tfm-test.pl beginfontk1.test dvips.test eepic-nan.test \
-	pfbincl.test quotecmd-test.pl
+TESTS = afm2tfm-test.pl beginfontk1.test eepic-nan.test pfbincl.test \
+	quotecmd-test.pl test-dvips
 TESTS_ENVIRONMENT = TEXMFCNF=$(srcdir)/../kpathsea \
 	TEXCONFIG=$(srcdir)/testdata TEXFONTS=$(srcdir)/testdata \
 	TEXFONTMAPS=$(srcdir)/testdata TEXPSHEADERS=$(srcdir)/testdata
@@ -1344,6 +1345,13 @@ quotecmd-test.pl.log: quotecmd-test.pl
 	--log-file $$b.log --trs-file $$b.trs \
 	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
 	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-dvips.log: test-dvips
+	@p='test-dvips'; \
+	b='test-dvips'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
 .test.log:
 	@p='$<'; \
 	$(am__set_b); \
diff --git a/Build/source/texk/dvipsk/dvips.test b/Build/source/texk/dvipsk/test-dvips
index 253515a5ce7..253515a5ce7 100755
--- a/Build/source/texk/dvipsk/dvips.test
+++ b/Build/source/texk/dvipsk/test-dvips