diff options
| -rw-r--r-- | ChangeLog | 3 | ||||
| -rw-r--r-- | po/Makefile | 12 |
2 files changed, 12 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog index dd4ad9ed1b..55e0018721 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2011-05-30 Ulrich Drepper <drepper@gmail.com> + * po/Makefile (po-sed-cmd): Add ksh to extensions. + (libc.pot): Work around missing support for .ksh extension in xgettext. + [BZ #12684] * resolv/res_send.c (__libc_res_nsend): Only go to the next name server if both request failed. diff --git a/po/Makefile b/po/Makefile index 4ac253e3d1..4d2f406525 100644 --- a/po/Makefile +++ b/po/Makefile @@ -1,4 +1,4 @@ -# Copyright (C) 1996-1999,2001,2002,2006,2007,2009 +# Copyright (C) 1996-1999,2001,2002,2006,2007,2009,2011 # Free Software Foundation, Inc. # This file is part of the GNU C Library. @@ -62,18 +62,24 @@ libc.pot: header.pot libc.pot.files sed -e 's/VERSION/$(version)/' \ -e "s/DATE/`date +'%Y-%m-%d %H:%M'$$disp`/" \ $< > $@.new + egrep -v '\.ksh$$' $(word 2,$^) > $(objdir)/tmp-libc.pot-files cd ..; $(XGETTEXT) --keyword=_ --keyword=N_ \ --add-comments=TRANS --flag=error:3:c-format \ --flag=f_print:2:c-format \ --sort-by-file --omit-header -E -n -d - \ - -f po/$(word 2,$^) >> po/$@.new + -f $(objdir)/tmp-libc.pot-files >> po/$@.new + egrep '\.ksh$$' $(word 2,$^) > $(objdir)/tmp-libc.pot-files + cd ..; $(XGETTEXT) --add-comments=TRANS --language=Shell \ + --sort-by-file --omit-header -E -n -o po/$@.new -j \ + -f $(objdir)/tmp-libc.pot-files po/$@.new + rm $(objdir)/tmp-libc.pot-files mv -f $@.new $@ ifeq ($(with-cvs),yes) test ! -d CVS || cvs $(CVSOPTS) ci -m'Regenerated from source files' $@ endif po-sed-cmd = \ - '/\/tst-/d;$(foreach S,[ch] cxx sh bash,$(subst .,\.,/.$S\(.in\)*$$/p;))' + '/\/tst-/d;$(foreach S,[ch] cxx sh ksh bash,$(subst .,\.,/.$S\(.in\)*$$/p;))' # Omit tst-* files, and get only files with the given suffixes. libc.pot.files: FORCE |