--- a/src/Makefile.in	Thu Oct 13 17:51:19 2005 +0000
+++ b/src/Makefile.in	Fri Oct 14 07:29:20 2005 +0000
@@ -548,7 +548,9 @@
 oct-errno.cc: oct-errno.cc.in ../Makeconf Makefile
 	@echo "making $@ from $<"
 	@if test -n "$(PERL)"; then \
-	  $(PERL) -e 'foreach $$key (keys(%!)) { $$x .= "#if defined ($$key)\n    { \"$$key\", $$key, },\n#endif\n"; }; while (<>) { s/^ *\@SYSDEP_ERRNO_LIST\@/$$x/; print; }' $< > $@.t; \
+	  $(srcdir)/mk-errno-list --perl "$(PERL)" < $< > $@.t;
+	elif test -n "$(PYTHON)"; then \
+	  $(srcdir)/mk-errno-list --python "$(PYTHON)" < $< > $@.t;
 	else \
 	  $(SED) '/@SYSDEP_ERRNO_LIST@/D' $< > $@.t; \
 	fi