[prev in list] [next in list] [prev in thread] [next in thread] 

List:       squid-cvs
Subject:    /bzr/squid3/trunk/ r9535: TestBed: fix translation errors from out-of-tree
From:       Amos Jeffries <amosjeffries () squid-cache ! org>
Date:       2009-02-25 4:08:59
Message-ID: 20090225041005.52596.qmail () squid-cache ! org
[Download RAW message or body]

--===============0438500502==
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

------------------------------------------------------------
revno: 9535
committer: Amos Jeffries <amosjeffries@squid-cache.org>
branch nick: trunk
timestamp: Tue 2009-02-24 21:08:59 -0700
message:
  TestBed: fix translation errors from out-of-tree distcheck
  
  TODO: other errors from distcheck.
modified:
  errors/Makefile.am

--===============0438500502==
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"; name="r9535.diff"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

=== modified file 'errors/Makefile.am'
--- a/errors/Makefile.am	2009-02-25 01:38:45 +0000
+++ b/errors/Makefile.am	2009-02-25 04:08:59 +0000
@@ -88,7 +88,7 @@
 		done; \
 	done; \
 	for l in $(TRANSLATIONS) templates; do \
-	  if test -d $(DESTDIR)$(DEFAULT_ERROR_DIR)/$$l; then \
+	  if test -d $(srcdir)/$$l; then \
 		for f in $(srcdir)/$$l/ERR_*; do \
 	        	rm -f $(DESTDIR)$(DEFAULT_ERROR_DIR)/$$l/`basename $$f`; \
 		done; \
@@ -148,13 +148,11 @@
 	  for lang in $(TRANSLATIONS); do \
 		test -d $$lang && rm -r $$lang; \
 		mkdir $$lang; \
-		cd $$lang; \
 		echo -n "Translate '$$lang' ..."; \
-		for f in `ls -1 ../$(srcdir)/templates`; do \
-			$(PO2HTML) --progress=none -i ../$(srcdir)/$$lang.po -t ../$(srcdir)/templates/$$f >$$f || exit 1; \
+		for f in `ls -1 $(srcdir)/templates`; do \
+			$(PO2HTML) --progress=none -i $(srcdir)/$$lang.po -t $(srcdir)/templates/$$f >$$lang/$$f || exit 1; \
 		done; \
 		echo "done."; \
-		cd ..; \
 	  done; \
 	else \
 	  if test "$(PO2HTML)" = "off" ; then \


--===============0438500502==--
[prev in list] [next in list] [prev in thread] [next in thread]