687 rpcgen should not generate absolute #includes

          --- old/usr/src/lib/libidmap/Makefile.com
          +++ new/usr/src/lib/libidmap/Makefile.com

   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 (the "License").
   6    6  # You may not use this file except in compliance with the License.
   7    7  #
   8    8  # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
   9    9  # or http://www.opensolaris.org/os/licensing.
  10   10  # See the License for the specific language governing permissions
  11   11  # and limitations under the License.

  12   12  #
  13   13  # When distributing Covered Code, include this CDDL HEADER in each
  14   14  # file and include the License file at usr/src/OPENSOLARIS.LICENSE.
  15   15  # If applicable, add the following below this CDDL HEADER, with the
  16   16  # fields enclosed by brackets "[]" replaced with your own identifying
  17   17  # information: Portions Copyright [yyyy] [name of copyright owner]
  18   18  #
  19   19  # CDDL HEADER END
  20   20  #
  21   21  #
       22 +# Copyright 2015 Gary Mills
  22   23  # Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
  23   24  #
  24   25  #
  25   26  
  26   27  LIBRARY =       libidmap.a
  27   28  VERS =          .1
  28   29  LINT_OBJECTS =  \
  29   30          directory_client.o      \
  30   31          directory_error.o       \
  31   32          directory_helper.o              \

  32   33          directory_rpc_clnt.o    \
  33   34          sidutil.o               \
  34   35          sized_array.o           \
  35   36          idmap_api.o             \
  36   37          idmap_cache.o           \
  37   38          utils.o
  38   39  
  39   40  OBJECTS = $(LINT_OBJECTS)       \
  40   41          idmap_xdr.o
  41   42  
  42   43  include ../../Makefile.lib
  43   44  C99MODE = $(C99_ENABLE)
  44   45  
  45   46  LIBS =          $(DYNLIB) $(LINTLIB)
  46   47  LDLIBS +=       -lc -lavl -lnsl -lnvpair -luutil
  47   48  
  48   49  SRCDIR =        ../common

  49   50  $(LINTLIB):=    SRCS = $(SRCDIR)/$(LINTSRC)
  50   51  
  51   52  IDMAP_PROT_X =          $(SRC)/uts/common/rpcsvc/idmap_prot.x
  52   53  
  53   54  CFLAGS +=       $(CCVERBOSE)
  54   55  CPPFLAGS +=     -D_REENTRANT -I$(SRCDIR)
  55   56  
  56   57  CERRWARN +=     -_gcc=-Wno-unused-variable
  57   58  CERRWARN +=     -_gcc=-Wno-switch
  58   59  
  59      -CLOBBERFILES += idmap_xdr.c
       60 +CLEANFILES +=   idmap_xdr.c
  60   61  
  61   62  lint := OBJECTS = $(LINT_OBJECTS)
  62   63  
  63   64  .KEEP_STATE:
  64   65  
  65   66  all: $(LIBS)
  66   67  
       68 +# Replace absolute include path with a relative path
  67   69  idmap_xdr.c:    $(IDMAP_PROT_X)
  68      -        $(RM) $@; $(RPCGEN) -CMNc -o $@ $(IDMAP_PROT_X)
       70 +        $(RPCGEN) -CMNc $(IDMAP_PROT_X) | \
       71 +        $(SED) '/^#include.*idmap_prot.h/s|"[^"]*"|<rpcsvc/idmap_prot.h>|' > $@
  69   72  
  70   73  lint: lintcheck
  71   74  
  72   75  LINTFLAGS += -erroff=E_CONSTANT_CONDITION
  73   76  LINTFLAGS64 += -erroff=E_CONSTANT_CONDITION
  74   77  
  75   78  include ../../Makefile.targ
    

XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX