[gimp-help-2] Damned lies: add DOC_LINGUAS to Makefile.am

[Ulf-D. Ehlert <ulfehlert src gnome org>]

commit 4b1f1f472b22d2430557e75479b7b170f330ad30
Author: Ulf-D. Ehlert <ulfehlert svn gnome org>
Date:   Thu Jul 16 12:57:26 2009 +0200

    Damned lies: add DOC_LINGUAS to Makefile.am
    
    DOC_LINGUAS is never used, but it should suppress warnings about
    missing variable on http://l10n.gnome.org/module/gimp-help-2/.
    More changes:
     * configure.ac: remove XML_LANG, this variable must not be configured
     * Makefile.am:  clean up language variables
     * Makefile.GNU: sync with Makefile.am

 Makefile.GNU |   19 +++++++++++++------
 Makefile.am  |   30 ++++++++++++++++++------------
 configure.ac |    9 ++++-----
 3 files changed, 35 insertions(+), 23 deletions(-)
---
diff --git a/Makefile.GNU b/Makefile.GNU
index 893b3c4..911e7a8 100644
--- a/Makefile.GNU
+++ b/Makefile.GNU
@@ -3,14 +3,21 @@
 ########################################################################
 
 # The GIMP manual languages
-ifneq ($(LINGUAS),)
-LANGUAGES  = $(LINGUAS)
-else ifneq ($(ALL_LINGUAS),)
-LANGUAGES  = $(ALL_LINGUAS)
-else
-LANGUAGES ?= de en es fr it ko nl nn pl ru sv zh_CN
+ALL_LINGUAS = de en es fr it ko nl nn pl ru sv zh_CN
+LANGUAGES = $(if $(LINGUAS), \
+              $(filter $(ALL_LINGUAS),$(LINGUAS)), \
+	      $(ALL_LINGUAS))
+ifneq ($(DOC_LINGUAS),)
+$(warning Do not set the internal variable DOC_LINGUAS)
 endif
+DOC_LINGUAS = $(LINGUAS)
 
+ifneq ($(XML_LANG),)
+$(error You must not set the internal variable XML_LANG)
+endif
+ifneq ($(PO_LANGS),)
+$(error You must not set the internal variable PO_LANGS)
+endif
 XML_LANG = en
 PO_LANGS = $(filter-out $(XML_LANG), $(LANGUAGES))
 
diff --git a/Makefile.am b/Makefile.am
index 37ca653..166579c 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,20 +2,26 @@
 
 SUBDIRS = quickreference
 
-# The GIMP manual languages
-# HIDE FROM AUTOMAKE #ifneq ($(LINGUAS),)
-# HIDE FROM AUTOMAKE #LANGUAGES  = $(LINGUAS)
-# HIDE FROM AUTOMAKE #else ifneq ($(ALL_LINGUAS),)
-# HIDE FROM AUTOMAKE #LANGUAGES  = $(ALL_LINGUAS)
-# HIDE FROM AUTOMAKE #else
-# HIDE FROM AUTOMAKE #LANGUAGES ?= de en es fr it ko nl nn pl ru sv zh_CN
-# HIDE FROM AUTOMAKE #endif
-
 # used for creating the ChangeLog
 LAST_RELEASE_TAG = GIMP_HELP_2_4_2
 
-XML_LANG = en
-PO_LANGS = $(filter-out $(XML_LANG), $(LANGUAGES))
+# The GIMP manual languages
+LANGUAGES = $(if $(LINGUAS), \
+              $(filter $(ALL_LINGUAS),$(LINGUAS)), \
+	      $(ALL_LINGUAS))
+# HIDE FROM AUTOMAKE #ifneq ($(DOC_LINGUAS),)
+# HIDE FROM AUTOMAKE #$(warning Do not set the internal variable DOC_LINGUAS)
+# HIDE FROM AUTOMAKE #endif
+DOC_LINGUAS = $(LINGUAS)
+
+# HIDE FROM AUTOMAKE #ifneq ($(XML_LANG),)
+# HIDE FROM AUTOMAKE #$(error You must not set the internal variable XML_LANG)
+# HIDE FROM AUTOMAKE #endif
+# HIDE FROM AUTOMAKE #ifneq ($(PO_LANGS),)
+# HIDE FROM AUTOMAKE #$(error You must not set the internal variable PO_LANGS)
+# HIDE FROM AUTOMAKE #endif
+# HIDE FROM AUTOMAKE #XML_LANG = en
+# HIDE FROM AUTOMAKE #PO_LANGS = $(filter-out $(XML_LANG), $(LANGUAGES))
 
 ## Essential external programs and their default options
 ## (some of these variables are provided via "configure" -- see configure.ac)
@@ -766,7 +772,7 @@ install-data-local:
 	$(cmd) $(MKDIR_P) $(DESTDIR)$(helpdir) || exit 77
 	$(cmd) $(echo_n) "*** Installing HTML:"
 	$(cmd) cd html && \
-	for lang in $(ALL_LINGUAS); do \
+	for lang in $(LANGUAGES); do \
 		$(echo_n) " $${lang}"; \
 		tar -chf- $${lang} | \
 		(cd $(DESTDIR)$(helpdir)/ && tar -xf-) || exit 70; \
diff --git a/configure.ac b/configure.ac
index 153d037..ebde587 100644
--- a/configure.ac
+++ b/configure.ac
@@ -25,14 +25,14 @@ AC_PROG_MAKE_SET
 AC_PROG_SED
 
 
-#  You can set the ALL_LINGUAS environment variable to
-#  control what languages are build.
+#  You can set the LINGUAS or LANGUAGES environment variable to
+#  control what languages are build:
+#      LINGUAS   will be re restricted to languges in ALL_LINGUAS
+#      LANGUAGES will override ALL_LINGUAS
 #
 #  Quickreference files are built for languages in
 #  QUICKREFERENCE_ALL_LINGUAS *and* (intersecton) ALL_LINGUAS
 
-XML_LANG="en"
-
 if test "x$ALL_LINGUAS" = "x"; then
   ALL_LINGUAS="de en es fr it ko nl nn pl ru sv zh_CN"
 fi
@@ -40,7 +40,6 @@ if test "x$QUICKREFERENCE_ALL_LINGUAS" = "x"; then
   QUICKREFERENCE_ALL_LINGUAS="de en fi fr it ko ru sv zh_CN"
 fi
 
-AC_SUBST(XML_LANG)
 AC_SUBST(ALL_LINGUAS)
 AC_SUBST(QUICKREFERENCE_ALL_LINGUAS)