Merge from upstream, fix build.

diff --cc errors/Makefile.am
index e42cf6a14cd804c94557e5235f37b646792d21ec,ea0a489057716d2cb16c3cac1fa19b36cb934b7f..434aee6e7845fdedaa220523901b017fd046bbb6
--- 1/errors/Makefile.am
--- 2/errors/Makefile.am
+++ b/errors/Makefile.am
@@@ -88,7 -88,7 +88,7 @@@ uninstall-local
  # undocumented hack.  You can use this target to create multi-lingual
  # error pages.  For example:
  #
--#     make ADDLANG=English DESTLANG=French addlang
++#     $(MAKE) ADDLANG=English DESTLANG=French addlang
  #
  # by Andres Kroonmaa <andre@mail.lbi.ee>
  #
@@@ -120,7 -120,7 +120,7 @@@ dist-hook
              || exit 1; \
          fi; \
        done; \
--      make translate; \
++      $(MAKE) translate; \
        for lang in $(TRANSLATIONS); do \
          if test -d $(srcdir)/$$lang ; then \
                test -d $(distdir)/$$lang \
@@@ -149,4 -149,4 +149,4 @@@ translate
        fi
  
  all:
--      make translate
++      $(MAKE) translate