[gimp-help-2] [make] Sync Makefiles

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

commit 59f1338bd02d1ef61de73c35db69416c896debdc
Author: Ulf-D. Ehlert <ulfehlert svn gnome org>
Date:   Thu Sep 17 13:05:17 2009 +0200

    [make] Sync Makefiles
    
    * Copy commands for cleaning up pot directory from Makefile.GNU
      to Makefile.am.
    * Add missing "COMPENDIUM" declaration to Makefile.am.
    * Fix find expression to handle empty "COMPENDIUM" variable.

 Makefile.GNU |    2 +-
 Makefile.am  |   11 ++++++++++-
 2 files changed, 11 insertions(+), 2 deletions(-)
---
diff --git a/Makefile.GNU b/Makefile.GNU
index 0b9648a..2d51961 100644
--- a/Makefile.GNU
+++ b/Makefile.GNU
@@ -75,7 +75,7 @@ src_file_predicates = \
 	-not -name '$(notdir $(AUTHORS_DOCBOOK_XML))'
 src_dir_predicates  = -name images -prune -o -type d -print
 pot_file_predicates = -type f
-po_file_predicates  = -type f -not -name $(COMPENDIUM)
+po_file_predicates  = -type f -not -name "$(COMPENDIUM)"
 xml_file_predicates = -name '*.xml'
 
 # List of authors and contributors (no DocBook)
diff --git a/Makefile.am b/Makefile.am
index beb868c..8e1136f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -68,7 +68,7 @@ src_file_predicates =       \
 	-not -name '$(notdir $(AUTHORS_DOCBOOK_XML))'
 src_dir_predicates  = -name images -prune -o -type d -print
 pot_file_predicates = -type f
-po_file_predicates  = -type f -not -name $(COMPENDIUM)
+po_file_predicates  = -type f -not -name "$(COMPENDIUM)"
 xml_file_predicates = -name '*.xml'
 
 # list of authors and contributors (no DocBook)
@@ -146,6 +146,10 @@ DISTCHECK_CONFIGURE_FLAGS = --without-gimp
 ## remember that automake defines "srcdir"
 helpdir  = $(gimpdatadir)/help
 
+# This variable is used by "msgmerge";
+# use empty variable to disable the compendium option
+COMPENDIUM = Compendium.po
+
 
 ########################################################################
 ####            Control the amount of output messages               ####
@@ -361,6 +365,11 @@ potfiles: $(POT_FILES)
 # HIDE FROM AUTOMAKE #	$$(cmd) if test -s $$<; then $$(call pot2po,$$<,$(1),$$@); else touch $$@; fi
 # HIDE FROM AUTOMAKE #po-$(1): $$($(1)_PO_FILES)
 # HIDE FROM AUTOMAKE #	$$(cmd) if test -e messages.mo; then rm -f messages.mo; fi
+# HIDE FROM AUTOMAKE #	$$(cmd) $(find_l) po/$(1)/ $$(po_file_predicates) | \
+# HIDE FROM AUTOMAKE #	while read pofile; do \
+# HIDE FROM AUTOMAKE #		potfile=pot/$$$${pofile#po/$(1)/}t; \
+# HIDE FROM AUTOMAKE #		test -e $$$${potfile} || rm -vf $$$${pofile}; \
+# HIDE FROM AUTOMAKE #	done
 # HIDE FROM AUTOMAKE #endef
 
 $(foreach LANG,$(PO_LANGS),$(eval $(call MAKE_PO_RULES,$(LANG))))