From: Amos Jeffries <amosjeffries@squid-cache.org>
Date: Thu, 7 Aug 2008 01:55:42 +0000 (-0600)
Subject: Fix snapshots
X-Git-Tag: SQUID_3_1_0_1~49^2~109
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=2920dd872381b59b4484b83ec3f625fd166cafe3;p=thirdparty%2Fsquid.git

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 05f478b519..70e1b511c6 100644
--- 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: