6945 illumos xgettext should be using from Makefile.master

          --- old/usr/src/lib/libc/makelibccatalog.sh
          +++ new/usr/src/lib/libc/makelibccatalog.sh

   1    1  #!/bin/sh
   2    2  #
   3    3  # CDDL HEADER START
   4    4  #
   5    5  # The contents of this file are subject to the terms of the
   6    6  # Common Development and Distribution License, Version 1.0 only
   7    7  # (the "License").  You may not use this file except in compliance
   8    8  # with the License.
   9    9  #
  10   10  # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
  11   11  # or http://www.opensolaris.org/os/licensing.
  12   12  # See the License for the specific language governing permissions
  13   13  # and limitations under the License.
  14   14  #
  15   15  # When distributing Covered Code, include this CDDL HEADER in each
  16   16  # file and include the License file at usr/src/OPENSOLARIS.LICENSE.
  17   17  # If applicable, add the following below this CDDL HEADER, with the
  18   18  # fields enclosed by brackets "[]" replaced with your own identifying
  19   19  # information: Portions Copyright [yyyy] [name of copyright owner]
  20   20  #
  21   21  # CDDL HEADER END

  22   22  #
  23   23  #
  24   24  # Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
  25   25  # Use is subject to license terms.
  26   26  #
  27   27  
  28   28  #
  29   29  # Copyright 2011 Nexenta Systems, Inc.  All rights reserved.
  30   30  #
  31   31  
  32      -XGETTEXT=xgettext
       32 +XGETTEXT=${XGETTEXT:-xgettext}
       33 +GETTEXT=${GETTEXT:-gettext}
  33   34  MSGDIR=$1
  34   35  
  35   36  #
  36   37  # Change Directory
  37   38  #
  38   39          cd ./port/gen
  39   40          rm -f *.po
  40   41  
  41   42  #
  42   43  #       get list of files
  43   44  #
  44      -FILES=`grep gettext *.c | sed "s/:.*//" | sort | sed "s/\.c//" | uniq`
       45 +FILES=`grep ${GETTEXT} *.c | sed "s/:.*//" | sort | sed "s/\.c//" | uniq`
  45   46  
  46   47  
  47   48  #
  48   49  #       Create po files
  49   50  #               No need for options for xgettext
  50   51  #
  51   52  for     i in ${FILES}
  52   53  do
  53   54          cat ${i}.c | sed "s/_libc_gettext/gettext/" > ${i}.i
  54   55          ${XGETTEXT} ${i}.i

  55   56          cat messages.po | sed "/^domain/d" > ${i}.po
  56   57          rm -f ${i}.i messages.po
  57   58  done
  58   59  
  59   60  #
  60   61  #       Create po files
  61   62  #               Use -a
  62   63  #
  63   64  
  64   65  # First, create errlst.c, if it doesn't exist.
  65   66  # new_list.c is created as a side effect
  66   67  if [ ! -f errlst.c ]; then
  67   68          awk -f errlist.awk errlist
  68   69          rmerr="errlst.c new_list.c"
  69   70  else
  70   71          rmerr=
  71   72  fi
  72   73  
  73   74  for     i in siglist errlst
  74   75  do
  75   76          cat ${i}.c | sed "s/_libc_gettext/gettext/" > ${i}.i
  76   77          ${XGETTEXT} -a  ${i}.i
  77   78          cat messages.po | sed "/^domain/d" > ${i}.po
  78   79          rm -f ${i}.i messages.po
  79   80  done
  80   81  
  81   82  #
  82   83  #       Copy .po files
  83   84  #
  84   85          cp *.po         ${MSGDIR}
  85   86  
  86   87  #
  87   88  #       And remove them
  88   89  #
  89   90          rm -f *.po ${rmerr}
  90   91  
  91   92  #
  92   93  # Change Directory
  93   94  #
  94   95          cd ../locale
  95   96          rm -f messages.po regerror.po
  96   97  
  97   98          ${XGETTEXT} -a regerror.c
  98   99          cat messages.po | sed "/^domain/d" > regerror.po
  99  100          rm -f regerror.i messages.po
 100  101          
 101  102  #
 102  103  # Copy .po file
 103  104  #
 104  105          cp regerror.po ${MSGDIR}
 105  106  
 106  107  # And remove it         
 107  108  
 108  109          rm -f regerror.po

XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX