Fix snapshots

 - FreeBSD version of sed installed on squid-cache does
  not provide the -r option, uses -E instead

 - shuffles the dist target specific actions all back into dist-hook
   so as to not interfere or fail on manual translations runs.

diff --git a/errors/Makefile.am b/errors/Makefile.am
index 05f478b519812d82acf28b13eb25df6d7e7db2fe..70e1b511c6ec239598d24500cb4f81493278167c 100644 (file)
--- a/errors/Makefile.am
+++ b/errors/Makefile.am
@@ -124,25 +124,25 @@ dist-hook:
          fi; \
        done; \
        if test "$(DO_TRANSLATE)" = "yes" ; then \
-               translate; \
+               make translate; \
+               test -d $(distdir)/$$lang \
+                 || mkdir $(distdir)/$$lang \
+                 || exit 1; \
+               cp -p $(srcdir)/$$lang/ERR_*  $(distdir)/$$lang \
+                 || exit 1; \
        fi
 
 translate:
        for lang in $(TRANSLATIONS); do \
                test -d $$lang && rm -r $$lang; \
                mkdir $$lang; \
-               test -d $(distdir)/$$lang \
-                 || mkdir $(distdir)/$$lang \
-                 || exit 1; \
                cd $$lang; \
                for f in `ls -1 ../templates`; do \
                        echo "po2html -i ../$$lang.po -t ../templates/$$f"; \
                        po2html -i ../$$lang.po -t ../templates/$$f \
-                        | sed -r s/\>\ \ ?\</\>\\n\</g >$$f || exit 1; \
+                        | sed -E s/\>\ \ ?\</\>\\n\</g >$$f || exit 1; \
                done; \
                cd ..; \
-               cp -p $(srcdir)/$$lang/ERR_*  $(distdir)/$$lang \
-                 || exit 1; \
        done
 
 all: