diff options
| author | Daniel Jacobowitz <dan@codesourcery.com> | 2006-05-31 15:34:37 +0000 |
|---|---|---|
| committer | Daniel Jacobowitz <dan@codesourcery.com> | 2006-05-31 15:34:37 +0000 |
| commit | f297a8a5bc0e1bcc962a63cf7ae24d8fb0a48b20 (patch) | |
| tree | b17a0dc31021af69de64f07f39aac02a99a1eec1 /config | |
| parent | f8cd6aa8778b6b54893679892e2cc90b247056a4 (diff) | |
gcc/, libcpp/
* Makefile.in (CATALOGS): Add po/ prefix.
* configure: Regenerated.
config/
* gettext-sister.m4 (ZW_GNU_GETTEXT_SISTER_DIR): Provide some
defines otherwise gotten from AM_GNU_GETTEXT. Remove the
po/ prefix from CATALOGS.
git-svn-id: https://gcc.gnu.org/svn/gcc/trunk@114268 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'config')
| -rw-r--r-- | config/ChangeLog | 6 | ||||
| -rw-r--r-- | config/gettext-sister.m4 | 17 |
2 files changed, 21 insertions, 2 deletions
diff --git a/config/ChangeLog b/config/ChangeLog index 2707b60900e..004fc361d0c 100644 --- a/config/ChangeLog +++ b/config/ChangeLog @@ -1,3 +1,9 @@ +2006-05-31 Daniel Jacobowitz <dan@codesourcery.com> + + * gettext-sister.m4 (ZW_GNU_GETTEXT_SISTER_DIR): Provide some + defines otherwise gotten from AM_GNU_GETTEXT. Remove the + po/ prefix from CATALOGS. + 2006-02-14 Paolo Bonzini <bonzini@gnu.org> Andreas Schwab <schwab@suse.de> diff --git a/config/gettext-sister.m4 b/config/gettext-sister.m4 index d10aae80b6b..700d31fcf87 100644 --- a/config/gettext-sister.m4 +++ b/config/gettext-sister.m4 @@ -46,8 +46,8 @@ else # by the backticks, then collapsed again by the double quotes, # leaving us with one backslash in the sed expression (right # before the dot that mustn't act as a wildcard). - cat=`echo $cat | sed -e "s!$srcdir/!!" -e "s!\\\\.po!.gmo!"` - lang=`echo $cat | sed -e 's!po/!!' -e "s!\\\\.gmo!!"` + cat=`echo $cat | sed -e "s!$srcdir/po/!!" -e "s!\\\\.po!.gmo!"` + lang=`echo $cat | sed -e "s!\\\\.gmo!!"` # The user is allowed to set LINGUAS to a list of languages to # install catalogs for. If it's empty that means "all of them." if test "x$LINGUAS" = x; then @@ -63,4 +63,17 @@ else done LINGUAS="$XLINGUAS" AC_MSG_RESULT($LINGUAS) + + dnl Set up some additional variables which our po/Make-in files + dnl may need. + + dnl For backward compatibility. Some Makefiles may be using these. + DATADIRNAME=share + AC_SUBST(DATADIRNAME) + INSTOBJEXT=.mo + AC_SUBST(INSTOBJEXT) + GENCAT=gencat + AC_SUBST(GENCAT) + CATOBJEXT=.gmo + AC_SUBST(CATOBJEXT) fi]) |