* aclocal.m4: (AM_WITH_NLS): Don't look at ALL_LINGUAS.

	(AM_GNU_GETTEXT): Set CATALOGS to a list of .gmo files
	corresponding to the complete set of .po and .gmo files in
	the source directory's po subdir, modified by LINGUAS.  Don't
	look at ALL_LINGUAS.
	* configure.in: Don't set ALL_LINGUAS.
	* configure: Regenerate.

	* Makefile.in (.po.gmo): Don't move into source directory.
	(.po.pox): Clarify comments.
	(install-po): Look for .gmo files in both srcdir and objdir;
	don't fail if a file is totally missing.
	(distclean): rmdir ada subdirectory too.


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@46800 138bc75d-0d04-0410-961f-82ee72b054a4

1 files changed, 16 insertions, 10 deletions

diff --git a/gcc/Makefile.in b/gcc/Makefile.in
index 8cb7fe4d98c..4ed39201da4 100644
--- a/gcc/Makefile.in
+++ b/gcc/Makefile.in
@@ -2449,7 +2449,7 @@ distclean: clean $(INTL_DISTCLEAN) lang.distclean
 	-rm -f mklibgcc libgcc.map gccbug .gdbinit configargs.h
 	-rm -f gcov.pod
 	-rm -f fixinc/Makefile
-	-rmdir cp f java objc fixinc intl po 2>/dev/null
+	-rmdir ada cp f java objc fixinc intl po 2>/dev/null
 
 # Delete anything likely to be found in the source directory
 # that shouldn't be in the distribution.
@@ -3363,29 +3363,35 @@ build-po: $(CATALOGS)
 # by people who are interested in updating .po files.
 update-po: $(CATALOGS:.gmo=.pox)
 
-# Update files in $(srcdir) atomically.
+# N.B. We do not attempt to copy these into $(srcdir).  The snapshot
+# script does that.
 .po.gmo:
 	test -d po || mkdir po
 	$(GMSGFMT) --statistics $< -o $@
-	$(SHELL) $(srcdir)/move-if-change $@ $(srcdir)/$@
 
-# This rule does _not_ copy into $(srcdir).  User must do this
-# by hand.  (User is a translation maintainer and is expected to
-# go through the new .po by hand anyway.)
+# The new .po has to be gone over by hand, so we deposit it into
+# build/po with a different extension.
 .po.pox:
 	test -d po || mkdir po
 	$(MSGMERGE) $< $(srcdir)/po/$(PACKAGE).pot -o $@
 
+# This rule has to look for .gmo modules in both srcdir and
+# the cwd, and has to check that we actually have a catalog
+# for each language, in case they weren't built or included
+# with the distribution.
 install-po:
 	$(SHELL) $(srcdir)/mkinstalldirs $(DESTDIR)$(datadir)
 	for cat in $(CATALOGS); do \
-	  cat=`basename $$cat`; \
-	  lang=`echo $$cat | sed 's/\.gmo$$//'`; \
+	  lang=`basename $$cat | sed 's/\.gmo$$//'`; \
+	  if [ -f $$cat ]; then :; \
+	  elif [ -f $(srcdir)/$$cat ]; then cat=$(srcdir)/$$cat; \
+	  else continue; \
+	  fi; \
 	  dir=$(localedir)/$$lang/LC_MESSAGES; \
 	  echo $(SHELL) $(srcdir)/mkinstalldirs $(DESTDIR)$$dir; \
 	  $(SHELL) $(srcdir)/mkinstalldirs $(DESTDIR)$$dir || exit 1; \
-	  echo $(INSTALL_DATA) $(srcdir)/po/$$cat $(DESTDIR)$$dir/$(PACKAGE).mo; \
-	  $(INSTALL_DATA) $(srcdir)/po/$$cat $(DESTDIR)$$dir/$(PACKAGE).mo; \
+	  echo $(INSTALL_DATA) $$cat $(DESTDIR)$$dir/$(PACKAGE).mo; \
+	  $(INSTALL_DATA) $$cat $(DESTDIR)$$dir/$(PACKAGE).mo; \
 	done
 
 # Rule for regenerating the message template (gcc.pot).