12482 Have /usr/bin/awk point to /usr/bin/nawk
Reviewed by: Peter Tribble <peter.tribble@gmail.com>
Reviewed by: Toomas Soome <tsoome@me.com>

          --- old/usr/src/cmd/awk/Makefile
          +++ new/usr/src/cmd/awk/Makefile

   1    1  #
   2    2  # CDDL HEADER START
   3    3  #
   4    4  # The contents of this file are subject to the terms of the
   5    5  # Common Development and Distribution License, Version 1.0 only
   6    6  # (the "License").  You may not use this file except in compliance
   7    7  # with the License.
   8    8  #
   9    9  # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
  10   10  # or http://www.opensolaris.org/os/licensing.
  11   11  # See the License for the specific language governing permissions
  12   12  # and limitations under the License.
  13   13  #
  14   14  # When distributing Covered Code, include this CDDL HEADER in each
  15   15  # file and include the License file at usr/src/OPENSOLARIS.LICENSE.
  16   16  # If applicable, add the following below this CDDL HEADER, with the

  17   17  # fields enclosed by brackets "[]" replaced with your own identifying
  18   18  # information: Portions Copyright [yyyy] [name of copyright owner]
  19   19  #
  20   20  # CDDL HEADER END
  21   21  #
  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      -# Copyright (c) 2018, Joyent, Inc.
       27 +# Copyright 2020 Joyent, Inc.
  28   28  
  29      -# NOTE: awk is oawk.
       29 +# NOTE: awk is now nawk.
  30   30  
  31   31  PROG= nawk
       32 +LINKPROG= awk
  32   33  
  33   34  OBJ1= b.o lib.o main.o parse.o proctab.o run.o tran.o lex.o
  34   35  OBJ2= awk.g.o
  35   36  OBJS= $(OBJ2) $(OBJ1)
  36   37  SRCS= $(OBJ1:%.o=%.c)
  37   38  
  38   39  include ../Makefile.cmd
  39   40  
       41 +ROOTLINK =      $(LINKPROG:%=$(ROOTBIN)/%)
       42 +
  40   43  CERRWARN += -_gcc=-Wno-unused-label
  41   44  CERRWARN += -_gcc=-Wno-parentheses
  42   45  CERRWARN += -_gcc=-Wno-unused-variable
  43   46  CERRWARN += $(CNOWARN_UNINIT)
  44   47  
  45   48  # not linted
  46   49  SMATCH=off
  47   50  
  48   51  #
  49   52  # Message catalog

  50   53  #
  51   54  POFILES= $(OBJS:%.o=%.po)
  52   55  POFILE= awk.po
  53   56  XGETFLAGS += -a -x awk.xcl

  54   57  #
  55   58  
  56   59  CPPFLAGS += -D_FILE_OFFSET_BITS=64
  57   60  YFLAGS += -d
  58   61  LDLIBS += -lm -lumem
  59   62  LINTFLAGS += -u
  60   63  CLEANFILES= maketab proctab.c awk.g.c y.tab.h
  61   64  
  62   65  .KEEP_STATE:
  63   66  
  64      -all: $(PROG)
       67 +all: $(PROG) $(ROOTLINK)
  65   68  
  66   69  $(PROG): $(OBJS)
  67   70          $(LINK.c) $(OBJS) -o $@ $(LDLIBS)
  68   71          $(POST_PROCESS)
  69   72  
       73 +$(ROOTLINK):    $(ROOTPROG)
       74 +        $(RM) $@; $(LN) $(ROOTPROG) $@
       75 +
  70   76  #
  71   77  # message catalog
  72   78  #
  73   79  
  74   80  $(POFILE):  y.tab.h $(POFILES)
  75   81          $(RM) $@
  76   82          cat $(POFILES) > $@
  77   83  #
  78   84  
  79   85  proctab.c: maketab
  80   86          rm -f $@; ./maketab > $@
  81   87  
  82   88  maketab: maketab.c
  83   89          $(NATIVECC) $(NATIVE_CFLAGS) maketab.c -o $@ $(LDLIBS)
  84   90  
  85   91  install: all $(ROOTPROG) $(ROOTLINK)
  86   92  
  87   93  clean:
  88   94          $(RM) $(OBJS) $(CLEANFILES)
  89   95  
  90      -lint: awk.g.c lint_SRCS
  91      -
  92   96  awk.g.c + y.tab.h: awk.g.y
  93   97  
  94   98  awk.g.o: awk.g.c
  95   99  
  96  100  proctab.o: proctab.c
  97  101          $(COMPILE.c) proctab.c
  98  102          $(POST_PROCESS_O)
  99  103  
 100  104  include ../Makefile.targ
    

XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX