gimp-help-2 r2811 - in trunk: . quickreference

[ulfehlert svn gnome org]

Author: ulfehlert
Date: Fri Apr 10 11:54:41 2009
New Revision: 2811
URL: http://svn.gnome.org/viewvc/gimp-help-2?rev=2811&view=rev

Log:
2009-04-10  Ulf-D. Ehlert  <ulfehlert svn gnome org>

	* quickreference/Makefile.am
	* configure.ac: simplified quickreference languages code


Modified:
   trunk/ChangeLog
   trunk/configure.ac
   trunk/quickreference/Makefile.am

Modified: trunk/configure.ac
==============================================================================
--- trunk/configure.ac	(original)
+++ trunk/configure.ac	Fri Apr 10 11:54:41 2009
@@ -26,27 +26,17 @@
 
 #  You can set the ALL_LINGUAS environment variable to
 #  control what languages are build.
-#  
-#  GIMP 2.2 Linguas: Content for those language code exist, but they
-#  haven't been worked on for a while:
-#  ALL_LINGUAS="cs de en es fr hr it ko nl no ru sv zh_CN"
 #
-XML_LANG="en"
+#  Quickreference files are built for languages in
+#  QUICKREFERENCE_ALL_LINGUAS *and* (intersecton) ALL_LINGUAS
 
-QUICKREFERENCE_ALL_LINGUAS="de en fi fr it ko ru sv"
+XML_LANG="en"
 
 if test "x$ALL_LINGUAS" = "x"; then
   ALL_LINGUAS="de en es fr it ko nl no pl ru sv"
-else
-  QUICKREFERENCE_LINGUAS=""
-  for asked_lang in $ALL_LINGUAS ; do
-    for lang in $QUICKREFERENCE_ALL_LINGUAS ; do
-      if test "$lang" = "$asked_lang"; then
-        QUICKREFERENCE_LINGUAS="$QUICKREFERENCE_LINGUAS $asked_lang"
-      fi
-    done
-  done
-  QUICKREFERENCE_ALL_LINGUAS=$QUICKREFERENCE_LINGUAS
+fi
+if test "x$QUICKREFERENCE_ALL_LINGUAS" = "x"; then
+  QUICKREFERENCE_ALL_LINGUAS="de en fi fr it ko ru sv"
 fi
 
 AC_SUBST(XML_LANG)

Modified: trunk/quickreference/Makefile.am
==============================================================================
--- trunk/quickreference/Makefile.am	(original)
+++ trunk/quickreference/Makefile.am	Fri Apr 10 11:54:41 2009
@@ -1,5 +1,9 @@
 ## Process this file with automake to produce Makefile.in
 
+ALL_LINGUAS ?= de en es fr it ko nl no pl ru sv
+QUICKREFERENCE_ALL_LINGUAS ?= de en fi fr it ko ru sv
+QUICKREFERENCE_LINGUAS = $(filter $(ALL_LINGUAS), $(QUICKREFERENCE_ALL_LINGUAS))
+
 PO_FILES = \
 	po/gimp-keys.pot\
 	po/de.po	\
@@ -49,7 +53,7 @@
 	  $< \
 	  > $@
 
-svg: $(foreach lang,$(QUICKREFERENCE_ALL_LINGUAS),svg/gimp-keys-$(lang).svg)
+svg: $(foreach lang,$(QUICKREFERENCE_LINGUAS),svg/gimp-keys-$(lang).svg)
 
 docbook/gimp-keys-%.xml: xml/gimp-keys-%.xml stylesheets/keys-docbook.xsl
 	$(mkdir_p) docbook
@@ -58,7 +62,7 @@
 	  $< \
 	  > $@
 
-docbook: $(foreach lang,$(QUICKREFERENCE_ALL_LINGUAS),docbook/gimp-keys-$(lang).xml)
+docbook: $(foreach lang,$(QUICKREFERENCE_LINGUAS),docbook/gimp-keys-$(lang).xml)
 
 if HAVE_XML2PO
 all-local: svg docbook