intltool r757 - trunk

[dobey svn gnome org]

Author: dobey
Date: Thu Sep  4 01:51:45 2008
New Revision: 757
URL: http://svn.gnome.org/viewvc/intltool?rev=757&view=rev

Log:
2008-09-03  Rodney Dawes  <dobey pwns gmail com>

	* Makefile.in.in (PO_LINGUAS, POFILES):
	Set PO_LINGUAS to ALL_LINGUAS if the LINGUAS file doesn't exist
	Use PO_LINGUAS instead of USE_LINGUAS in POFILES for disting

	Fixes #550727



Modified:
   trunk/ChangeLog
   trunk/Makefile.in.in

Modified: trunk/Makefile.in.in
==============================================================================
--- trunk/Makefile.in.in	(original)
+++ trunk/Makefile.in.in	Thu Sep  4 01:51:45 2008
@@ -54,13 +54,13 @@
 
 ALL_LINGUAS = @ALL_LINGUAS@
 
-PO_LINGUAS=$(shell if test -r $(srcdir)/LINGUAS; then grep -v "^\#" $(srcdir)/LINGUAS; fi)
+PO_LINGUAS=$(shell if test -r $(srcdir)/LINGUAS; then grep -v "^\#" $(srcdir)/LINGUAS; else echo "$(ALL_LINGUAS)"; fi)
 
 USER_LINGUAS=$(shell if test -n "$(LINGUAS)"; then LLINGUAS="$(LINGUAS)"; ALINGUAS="$(ALL_LINGUAS)"; for lang in $$LLINGUAS; do if test -n "`grep ^$$lang$$ $(srcdir)/LINGUAS 2>/dev/null`" -o -n "`echo $$ALINGUAS|tr ' ' '\n'|grep ^$$lang$$`"; then printf "$$lang "; fi; done; fi)
 
 USE_LINGUAS=$(shell if test -n "$(USER_LINGUAS)" -o -n "$(LINGUAS)"; then LLINGUAS="$(USER_LINGUAS)"; else if test -n "$(PO_LINGUAS)"; then LLINGUAS="$(PO_LINGUAS)"; else LLINGUAS="$(ALL_LINGUAS)"; fi; fi; for lang in $$LLINGUAS; do printf "$$lang "; done)
 
-POFILES=$(shell LINGUAS="$(USE_LINGUAS)"; for lang in $$LINGUAS; do printf "$$lang.po "; done)
+POFILES=$(shell LINGUAS="$(PO_LINGUAS)"; for lang in $$LINGUAS; do printf "$$lang.po "; done)
 
 DISTFILES = ChangeLog Makefile.in.in POTFILES.in $(POFILES)
 EXTRA_DISTFILES = POTFILES.skip Makevars LINGUAS