3 files changed, 12 insertions, 4 deletions
diff --git a/Build/source/texk/web2c/etexdir/ChangeLog b/Build/source/texk/web2c/etexdir/ChangeLog
index d194cfd5949..106ebd2b468 100644
--- a/Build/source/texk/web2c/etexdir/ChangeLog
+++ b/Build/source/texk/web2c/etexdir/ChangeLog
@@ -1,3 +1,11 @@
+2011-01-15  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	* etrip/etrip.tex: Fixed 'wrong last node type' diagnostic.
+
+2011-01-14  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	* am/etex.am (etrip-clean): Use TRIPTRAP_CLEAN.
+
 2011-01-14  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
 	* etex.ch: Mention \protected in error and help messages only
diff --git a/Build/source/texk/web2c/etexdir/am/etex.am b/Build/source/texk/web2c/etexdir/am/etex.am
index 90793c47ba1..008aeebc65a 100644
--- a/Build/source/texk/web2c/etexdir/am/etex.am
+++ b/Build/source/texk/web2c/etexdir/am/etex.am
@@ -85,12 +85,12 @@ if ETEX
 TESTS += $(etex_tests)
 check_PROGRAMS += dvitype pltotf tftopl
 TRIPTRAP += etrip.diffs
+TRIPTRAP_CLEAN += etrip-clean
 endif ETEX
 DISTCLEANFILES += etrip.diffs
 
-.PHONY: etrip-clean
-clean-local:: etrip-clean
 # etrip.test
+.PHONY: etrip-clean
 etrip-clean:
 	rm -f trip.tfm trip.pl trip.tex trip.fmt ctripin.fot ctripin.log
 	rm -f ctrip.fot ctrip.log trip.dvi ctrip.typ
diff --git a/Build/source/texk/web2c/etexdir/etrip/etrip.tex b/Build/source/texk/web2c/etexdir/etrip/etrip.tex
index dd9459d7fe2..33f747a8b18 100644
--- a/Build/source/texk/web2c/etexdir/etrip/etrip.tex
+++ b/Build/source/texk/web2c/etexdir/etrip/etrip.tex
@@ -302,8 +302,8 @@
       \ifnum-1=\lastnodetype empty\else UNKNOWN!\fi\fi}%
     \typeout{last node type (l.\number\inputlineno): \6}}
   \def\2 #1 {\relax\ifnum#1=\lastnodetype \5\else
-    \typeout{wrong last node type:
-             \number\lastnodetype\space should be #1!}\fi}
+    \edef\6{\number\lastnodetype}%
+    \typeout{wrong last node type: \6 should be #1!}\fi}
   \def\3 #1 {\relax\ifnum#1=\currentgrouplevel \else
     \typeout{wrong current group level:
              \number\currentgrouplevel\space should be #1!}\fi}