[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

[kov at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit d9f1acde813560ba20b601616473d37ea85af219
Author: kov at webkit.org <kov at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Sep 29 19:08:23 2010 +0000

    2010-09-29  Gustavo Noronha Silva  <gustavo.noronha at collabora.co.uk>
    
            Reviewed by Martin Robinson.
    
            Avoid touching the po files automatically during the build
            process. The maintainers still have the option of forcing an
            update with make update-po.
    
            * GNUmakefile.am:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@68674 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/gtk/po/ChangeLog b/WebKit/gtk/po/ChangeLog
index 8ae678f..29bef79 100644
--- a/WebKit/gtk/po/ChangeLog
+++ b/WebKit/gtk/po/ChangeLog
@@ -1,3 +1,13 @@
+2010-09-29  Gustavo Noronha Silva  <gustavo.noronha at collabora.co.uk>
+
+        Reviewed by Martin Robinson.
+
+        Avoid touching the po files automatically during the build
+        process. The maintainers still have the option of forcing an
+        update with make update-po.
+
+        * GNUmakefile.am:
+
 2010-09-29  Miloš Popović  <gpopac at gmail.com>
 
         Reviewed by Gustavo Noronha Silva.
diff --git a/WebKit/gtk/po/GNUmakefile.am b/WebKit/gtk/po/GNUmakefile.am
index 2c5ff94..4314573 100644
--- a/WebKit/gtk/po/GNUmakefile.am
+++ b/WebKit/gtk/po/GNUmakefile.am
@@ -95,19 +95,22 @@ $(srcdir)/WebKit/gtk/po/$(DOMAIN).pot:
 
 # This target rebuilds a PO file if $(DOMAIN).pot has changed.
 # Note that a PO file is not touched if it doesn't need to be changed.
-$(POFILES): $(srcdir)/WebKit/gtk/po/$(DOMAIN).pot
-	@lang=`echo $@ | sed -e 's,.*/,,' -e 's/\.po$$//'`; \
-	if test -f "$(srcdir)/WebKit/gtk/po/$${lang}.po"; then \
-	  test "$(srcdir)" = . && cdcmd="" || cdcmd="cd $(srcdir)/WebKit/gtk/po && "; \
-	  echo "$${cdcmd}$(MSGMERGE_UPDATE) $${lang}.po $(DOMAIN).pot"; \
-	  cd $(srcdir)/WebKit/gtk/po && $(MSGMERGE_UPDATE) $${lang}.po $(DOMAIN).pot; \
-	else \
-	  $(MAKE) $${lang}.po-create; \
-	fi
+update-po-files: $(srcdir)/WebKit/gtk/po/$(DOMAIN).pot
+	@for pofile in $(POFILES); do \
+	  lang=`echo $$pofile | sed -e 's,.*/,,' -e 's/\.po$$//'`; \
+	  if test -f "$(srcdir)/WebKit/gtk/po/$${lang}.po"; then \
+	    test "$(srcdir)" = . && cdcmd="" || cdcmd="cd $(srcdir)/WebKit/gtk/po && "; \
+	    echo "$${cdcmd}$(MSGMERGE_UPDATE) $${lang}.po $(DOMAIN).pot"; \
+	    pushd $(srcdir)/WebKit/gtk/po && $(MSGMERGE_UPDATE) $${lang}.po $(DOMAIN).pot; \
+	    popd; \
+	  else \
+	    $(MAKE) $${lang}.po-create; \
+	  fi; \
+	done
 
 update-po: GNUmakefile
 	$(MAKE) $(DOMAIN).pot-update
-	$(MAKE) $(POFILES)
+	$(MAKE) update-po-files
 	$(MAKE) $(MOFILES)
 
 .nop.po-create:

-- 
WebKit Debian packaging