diff options
| author | Bruno Haible <bruno@clisp.org> | 2001-11-12 12:26:20 +0000 |
|---|---|---|
| committer | Bruno Haible <bruno@clisp.org> | 2009-06-21 22:56:59 +0200 |
| commit | ac2b61ab8f541bcd9f9f90094a808fbe4e0c77c0 (patch) | |
| tree | bda66dbe2c26214119ec8a8cb96f1c4da471a9f5 /m4 | |
| parent | 66a0a1b27af006c9522514866541708341cac060 (diff) | |
| download | external_gettext-ac2b61ab8f541bcd9f9f90094a808fbe4e0c77c0.zip external_gettext-ac2b61ab8f541bcd9f9f90094a808fbe4e0c77c0.tar.gz external_gettext-ac2b61ab8f541bcd9f9f90094a808fbe4e0c77c0.tar.bz2 | |
Make "update-po" work in VPATH builds as well.
Diffstat (limited to 'm4')
| -rw-r--r-- | m4/ChangeLog | 5 | ||||
| -rw-r--r-- | m4/gettext.m4 | 8 |
2 files changed, 11 insertions, 2 deletions
diff --git a/m4/ChangeLog b/m4/ChangeLog index aae234e..532e92a 100644 --- a/m4/ChangeLog +++ b/m4/ChangeLog @@ -1,5 +1,10 @@ 2001-11-11 Bruno Haible <haible@clisp.cons.org> + * gettext.m4 (AM_GNU_GETTEXT): For builds with $builddir != $srcdir, + prepend $(srcdir) to all elements of POFILES and GMOFILES. + +2001-11-11 Bruno Haible <haible@clisp.cons.org> + * javaexec.m4 (gt_JAVAEXEC): Use HAVE_JAVA instead of HAVE_JAVA_JVM. The problem seen with automake-1.4 is gone with automake-1.5. diff --git a/m4/gettext.m4 b/m4/gettext.m4 index a8678a6..4b04458 100644 --- a/m4/gettext.m4 +++ b/m4/gettext.m4 @@ -257,11 +257,15 @@ return (int) gettext ("")]ifelse([$2], need-ngettext, [ + (int) ngettext ("", "" # Hide the ALL_LINGUAS assigment from automake. eval 'ALL_LINGUAS''=$ALL_LINGUAS_' fi + case "$ac_given_srcdir" in + .) srcdirpre= ;; + *) srcdirpre='$(srcdir)/' ;; + esac GMOFILES= POFILES= for lang in $ALL_LINGUAS; do - GMOFILES="$GMOFILES $lang.gmo" - POFILES="$POFILES $lang.po" + GMOFILES="$GMOFILES $srcdirpre$lang.gmo" + POFILES="$POFILES $srcdirpre$lang.po" done # CATALOGS depends on both $ac_dir and the user's LINGUAS # environment variable. |