* Makefile.in (.po.pox): Look both in srcdir and builddir

	for $(PACKAGE).pot.
	(po/$(PACKAGE).pot): Don't move-if-change the new potfile over
	to the source directory.
	* po/exgettext: Deposit new potfile in po subdir.


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

1 files changed, 6 insertions, 3 deletions

diff --git a/gcc/Makefile.in b/gcc/Makefile.in
index 31cafdc3461..f3caa037107 100644
--- a/gcc/Makefile.in
+++ b/gcc/Makefile.in
@@ -3379,9 +3379,13 @@ update-po: $(CATALOGS:.gmo=.pox)
 
 # The new .po has to be gone over by hand, so we deposit it into
 # build/po with a different extension.
+# If build/po/$(PACKAGE).pot exists, use it (it was just created),
+# else use the one in srcdir.
 .po.pox:
 	test -d po || mkdir po
-	$(MSGMERGE) $< $(srcdir)/po/$(PACKAGE).pot -o $@
+	$(MSGMERGE) $< `if test -f po/$(PACKAGE).pot; \
+			then echo po/$(PACKAGE).pot; \
+			else echo $(srcdir)/po/$(PACKAGE).pot; fi` -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
@@ -3408,11 +3412,10 @@ install-po:
 # relatively harmless since the .po files do not directly depend on it.
 # Note that exgettext has an awk script embedded in it which requires a
 # fairly modern (POSIX-compliant) awk.
+# The .pot file is left in the build directory.
 $(PACKAGE).pot: po/$(PACKAGE).pot
 po/$(PACKAGE).pot: force
 	test -d po || mkdir po
 	$(MAKE) po-generated
 	AWK=$(AWK) $(SHELL) $(srcdir)/po/exgettext \
 		$(XGETTEXT) $(PACKAGE) $(srcdir)
-	$(SHELL) $(srcdir)/move-if-change $(PACKAGE).pot \
-		$(srcdir)/po/$(PACKAGE).pot