7 files changed, 26 insertions, 21 deletions
diff --git a/Build/source/texk/afm2pl/ChangeLog b/Build/source/texk/afm2pl/ChangeLog
index dde61398f94..7502fff7de0 100644
--- a/Build/source/texk/afm2pl/ChangeLog
+++ b/Build/source/texk/afm2pl/ChangeLog
@@ -1,3 +1,9 @@
+2011-09-27  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	* logo10.afm, xlogo10.{pl,map} (removed): Moved from here ...
+	* tests/logo10.{afm,pl,mps} (new): ... to here.
+	* afm2pl.test: Test input and expected output now in tests/.
+
 2011-06-16  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
 	* afm2pl.c (find_suffix, !KPATHSEA): Declare result as const.
diff --git a/Build/source/texk/afm2pl/Makefile.am b/Build/source/texk/afm2pl/Makefile.am
index ab3e45ec256..93e246a0249 100644
--- a/Build/source/texk/afm2pl/Makefile.am
+++ b/Build/source/texk/afm2pl/Makefile.am
@@ -1,6 +1,6 @@
 ## Makefile.am for the TeX Live subdirectory texk/afm2pl/
 ##
-## Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org>
+## Copyright (C) 2009, 2011 Peter Breitenlohner <tex-live@tug.org>
 ## You may freely use, modify and/or distribute this file.
 ##
 ACLOCAL_AMFLAGS = -I ../../m4
@@ -27,14 +27,17 @@ LDADD = $(KPATHSEA_LIBS)
 
 dist_man1_MANS = afm2pl.1
 
-TESTS = afm2pl.test
-
-EXTRA_DIST = afm2pl.test logo10.afm xlogo10.map xlogo10.pl
-
-CLEANFILES = logo10.map logo10.pl
-
 ## Not used
 ##
-EXTRA_DIST += \
+EXTRA_DIST = \
 	afm2pl.xml README.DOCS
 
+## Tests
+##
+TESTS = afm2pl.test
+EXTRA_DIST += $(TESTS)
+
+## afm2pl.test
+EXTRA_DIST += tests/logo10.afm tests/logo10.map tests/logo10.pl
+DISTCLEANFILES += logo10.*
+
diff --git a/Build/source/texk/afm2pl/Makefile.in b/Build/source/texk/afm2pl/Makefile.in
index 321602a0930..ff116db4905 100644
--- a/Build/source/texk/afm2pl/Makefile.in
+++ b/Build/source/texk/afm2pl/Makefile.in
@@ -251,13 +251,12 @@ ACLOCAL_AMFLAGS = -I ../../m4
 INCLUDES = $(KPATHSEA_INCLUDES)
 AM_CFLAGS = $(WARNING_CFLAGS)
 afm2pl_SOURCES = afm2pl.c
-DISTCLEANFILES = config.force
+DISTCLEANFILES = config.force logo10.*
 LDADD = $(KPATHSEA_LIBS)
 dist_man1_MANS = afm2pl.1
+EXTRA_DIST = afm2pl.xml README.DOCS $(TESTS) tests/logo10.afm \
+	tests/logo10.map tests/logo10.pl
 TESTS = afm2pl.test
-EXTRA_DIST = afm2pl.test logo10.afm xlogo10.map xlogo10.pl afm2pl.xml \
-	README.DOCS
-CLEANFILES = logo10.map logo10.pl
 all: c-auto.h
 	$(MAKE) $(AM_MAKEFLAGS) all-am
 
@@ -762,7 +761,6 @@ install-strip:
 mostlyclean-generic:
 
 clean-generic:
-	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
 
 distclean-generic:
 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
diff --git a/Build/source/texk/afm2pl/afm2pl.test b/Build/source/texk/afm2pl/afm2pl.test
index c0a76ad1852..9453c85baf2 100755
--- a/Build/source/texk/afm2pl/afm2pl.test
+++ b/Build/source/texk/afm2pl/afm2pl.test
@@ -1,14 +1,12 @@
 #! /bin/sh
 
-# Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org>
+# Copyright (C) 2009, 2011 Peter Breitenlohner <tex-live@tug.org>
 # You may freely use, modify and/or distribute this file.
 
-rm -f logo10.pl logo10.map
-
+rm -f logo10.*
 TEXMFCNF=$srcdir/../kpathsea \
-  ./afm2pl -l 0 $srcdir/logo10 ./logo10.pl || exit 1
-
-diff $srcdir/xlogo10.pl logo10.pl || exit 1
-
-diff $srcdir/xlogo10.map logo10.map || exit 1
+	./afm2pl -l 0 $srcdir/tests/logo10 ./logo10.pl \
+	&& diff $srcdir/tests/logo10.pl logo10.pl \
+	&& diff $srcdir/tests/logo10.map logo10.map \
+	|| exit 1
 
diff --git a/Build/source/texk/afm2pl/logo10.afm b/Build/source/texk/afm2pl/tests/logo10.afm
index 6c5759a4504..6c5759a4504 100644
--- a/Build/source/texk/afm2pl/logo10.afm
+++ b/Build/source/texk/afm2pl/tests/logo10.afm
diff --git a/Build/source/texk/afm2pl/xlogo10.map b/Build/source/texk/afm2pl/tests/logo10.map
index 6e73c7d73af..6e73c7d73af 100644
--- a/Build/source/texk/afm2pl/xlogo10.map
+++ b/Build/source/texk/afm2pl/tests/logo10.map
diff --git a/Build/source/texk/afm2pl/xlogo10.pl b/Build/source/texk/afm2pl/tests/logo10.pl
index 414450ed2c1..414450ed2c1 100644
--- a/Build/source/texk/afm2pl/xlogo10.pl
+++ b/Build/source/texk/afm2pl/tests/logo10.pl