diff options
| author | Zack Weinberg <zack@codesourcery.com> | 2001-11-09 17:51:56 +0000 |
|---|---|---|
| committer | Zack Weinberg <zack@gcc.gnu.org> | 2001-11-09 17:51:56 +0000 |
| commit | 359cd11e36c75042c0daf24017b8c10a71f54dd0 (patch) | |
| tree | 677421f6037abba13396e0e5fc0c5100fcc7b648 | |
| parent | 8fbea508b1fb6be8eac773b5c3adbe1ea16b63d2 (diff) | |
| download | gcc-359cd11e36c75042c0daf24017b8c10a71f54dd0.zip gcc-359cd11e36c75042c0daf24017b8c10a71f54dd0.tar.gz gcc-359cd11e36c75042c0daf24017b8c10a71f54dd0.tar.bz2 | |
Makefile.in (.po.pox): Look both in srcdir and builddir for $(PACKAGE).pot.
* 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.
From-SVN: r46884
| -rw-r--r-- | gcc/ChangeLog | 7 | ||||
| -rw-r--r-- | gcc/Makefile.in | 9 | ||||
| -rw-r--r-- | gcc/po/ChangeLog | 4 | ||||
| -rw-r--r-- | gcc/po/exgettext | 2 |
4 files changed, 18 insertions, 4 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index ddb272e..8581a29 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,10 @@ +2001-11-08 Zack Weinberg <zack@codesourcery.com> + + * 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. + 2001-11-09 Ben Elliston <bje@redhat.com> Michael Meissner <meissner@redhat.com> Andrew MacLeod <amacleod@redhat.com> diff --git a/gcc/Makefile.in b/gcc/Makefile.in index 31cafdc3..f3caa03 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 diff --git a/gcc/po/ChangeLog b/gcc/po/ChangeLog index 05af2a7..aae815f 100644 --- a/gcc/po/ChangeLog +++ b/gcc/po/ChangeLog @@ -1,3 +1,7 @@ +2001-11-08 Zack Weinberg <zack@codesourcery.com> + + * exgettext: Deposit new potfile in po subdir. + 2001-10-31 Zack Weinberg <zack@codesourcery.com> * EXCLUDES: New file. diff --git a/gcc/po/exgettext b/gcc/po/exgettext index 824763f..6b1073e 100644 --- a/gcc/po/exgettext +++ b/gcc/po/exgettext @@ -153,4 +153,4 @@ END { echo "running xgettext..." >&2 $xgettext --default-domain=$package --directory=$srcdir \ --add-comments `cat $kopt` --files-from=$posr \ - -o $package.pot + -o po/$package.pot |