Print this page


Split Close
Expand all
Collapse all
          --- old/usr/src/Targetdirs
          +++ new/usr/src/Targetdirs
↓ open down ↓ 15 lines elided ↑ open up ↑
  16   16  # information: Portions Copyright [yyyy] [name of copyright owner]
  17   17  #
  18   18  # CDDL HEADER END
  19   19  #
  20   20  
  21   21  #
  22   22  # Copyright (c) 1989, 2010, Oracle and/or its affiliates. All rights reserved.
  23   23  # Copyright 2011, Richard Lowe
  24   24  # Copyright (c) 2012 by Delphix. All rights reserved.
  25   25  # Copyright (c) 2012, Igor Kozhukhov <ikozhukhov@gmail.com>
  26      -# Copyright 2012 OmniTI Computer Consulting, Inc.  All rights reserved.
  27   26  # Copyright (c) 2013 RackTop Systems.
  28   27  # Copyright 2014 Garrett D'Amore <garrett@damore.org>
  29   28  # Copyright 2014 Nexenta Systems, Inc.  All rights reserved.
       29 +# Copyright 2015 OmniTI Computer Consulting, Inc.  All rights reserved.
  30   30  #
  31   31  
  32   32  #
  33   33  # It is easier to think in terms of directory names without the ROOT macro
  34   34  # prefix.  ROOTDIRS is TARGETDIRS with ROOT prefixes.  It is necessary
  35   35  # to work with ROOT prefixes when controlling conditional assignments.
  36   36  #
  37   37  
  38   38  DIRLINKS=       $(SYM.DIRS)
  39   39  $(BUILD64)      DIRLINKS += $(SYM.DIRS64)
↓ open down ↓ 6 lines elided ↑ open up ↑
  46   46  
  47   47  TARGETDIRS      += $(FILELINKS) $(DIRLINKS)
  48   48  
  49   49  i386_DIRS=                      \
  50   50          /boot/acpi              \
  51   51          /boot/acpi/tables       \
  52   52          /boot/grub              \
  53   53          /boot/grub/bin          \
  54   54          /platform/i86pc         \
  55   55          /lib/libmvec            \
  56      -        /usr/lib/brand/lx       \
       56 +        /usr/lib/brand/lx \
  57   57          /usr/lib/brand/lx/amd64 \
  58      -        /usr/lib/brand/lx/distros \
  59   58          /usr/lib/xen            \
  60   59          /usr/lib/xen/bin
  61   60  
  62   61  sparc_DIRS=                             \
  63   62          /usr/lib/ldoms
  64   63  
  65   64  sparc_64ONLY= $(POUND_SIGN)
  66   65  64ONLY=  $($(MACH)_64ONLY)
  67   66  
  68   67  $(64ONLY) MACH32_DIRS=/usr/ucb/$(MACH32)
↓ open down ↓ 173 lines elided ↑ open up ↑
 242  241          /usr/include/scsi \
 243  242          /usr/include/security \
 244  243          /usr/include/sys/crypto \
 245  244          /usr/include/tsol \
 246  245          /usr/kernel  \
 247  246          /usr/kvm \
 248  247          /usr/lib \
 249  248          /usr/lib/abi \
 250  249          /usr/lib/brand \
 251  250          /usr/lib/brand/ipkg \
      251 +        /usr/lib/brand/lipkg \
 252  252          /usr/lib/brand/labeled \
 253  253          /usr/lib/brand/shared \
 254  254          /usr/lib/brand/sn1 \
 255  255          /usr/lib/brand/solaris10 \
 256  256          /usr/lib/class \
 257  257          /usr/lib/class/FSS \
 258  258          /usr/lib/class/FX \
 259  259          /usr/lib/class/IA \
 260  260          /usr/lib/class/RT \
 261  261          /usr/lib/class/SDC \
↓ open down ↓ 14 lines elided ↑ open up ↑
 276  276          /usr/lib/inet/ilb \
 277  277          /usr/lib/inet/$(MACH32) \
 278  278          /usr/lib/inet/wanboot \
 279  279          /usr/lib/krb5 \
 280  280          /usr/lib/link_audit \
 281  281          /usr/lib/lwp \
 282  282          /usr/lib/mdb \
 283  283          /usr/lib/mdb/kvm \
 284  284          /usr/lib/mdb/proc \
 285  285          /usr/lib/nfs \
 286      -        /usr/lib/varpd \
 287  286          /usr/net \
 288  287          /usr/net/servers \
 289  288          /usr/lib/pool \
 290      -        /usr/lib/python$(PYTHON_VERSION) \
 291      -        /usr/lib/python$(PYTHON_VERSION)/vendor-packages \
 292      -        /usr/lib/python$(PYTHON_VERSION)/vendor-packages/64 \
 293      -        /usr/lib/python$(PYTHON_VERSION)/vendor-packages/solaris \
 294      -        /usr/lib/python$(PYTHON_VERSION)/vendor-packages/zfs \
 295      -        /usr/lib/python$(PYTHON_VERSION)/vendor-packages/beadm \
      289 +        /usr/lib/python2.6 \
      290 +        /usr/lib/python2.6/vendor-packages \
      291 +        /usr/lib/python2.6/vendor-packages/64 \
      292 +        /usr/lib/python2.6/vendor-packages/solaris \
      293 +        /usr/lib/python2.6/vendor-packages/zfs \
      294 +        /usr/lib/python2.6/vendor-packages/beadm \
 296  295          /usr/lib/rcap \
 297  296          /usr/lib/rcap/$(MACH32) \
 298  297          /usr/lib/sa  \
 299  298          /usr/lib/saf \
 300  299          /usr/lib/sasl \
 301  300          /usr/lib/scsi \
 302  301          /usr/lib/secure \
 303  302          /usr/lib/security \
 304  303          /usr/lib/smbsrv \
 305  304          /usr/lib/vscan \
↓ open down ↓ 157 lines elided ↑ open up ↑
 463  462          /usr/lib/lwp/$(MACH64) \
 464  463          /usr/lib/mdb/kvm/$(MACH64) \
 465  464          /usr/lib/mdb/proc/$(MACH64) \
 466  465          /usr/lib/rcap/$(MACH64) \
 467  466          /usr/lib/sasl/$(MACH64) \
 468  467          /usr/lib/scsi/$(MACH64) \
 469  468          /usr/lib/secure/$(MACH64) \
 470  469          /usr/lib/security/$(MACH64) \
 471  470          /usr/lib/smbsrv/$(MACH64) \
 472  471          /usr/lib/abi/$(MACH64) \
 473      -        /usr/lib/varpd/$(MACH64) \
 474  472          /usr/sbin/$(MACH64) \
 475  473          /usr/ucb/$(MACH64) \
 476  474          /usr/ucblib/$(MACH64) \
 477  475          /usr/xpg4/lib/$(MACH64) \
 478  476          /var/ld/$(MACH64)
 479  477  
 480  478  # /var/mail/:saved is built directly by the rootdirs target in
 481  479  # /usr/src/Makefile because of the colon in its name.
 482  480  
 483  481  # macros for symbolic links
↓ open down ↓ 40 lines elided ↑ open up ↑
 524  522          /lib/crypto/64 \
 525  523          /lib/secure/64 \
 526  524          /usr/lib/64 \
 527  525          /usr/lib/brand/sn1/64 \
 528  526          /usr/lib/brand/solaris10/64 \
 529  527          /usr/lib/elfedit/64 \
 530  528          /usr/lib/link_audit/64 \
 531  529          /usr/lib/lwp/64 \
 532  530          /usr/lib/secure/64 \
 533  531          /usr/lib/security/64 \
 534      -        /usr/lib/varpd/64 \
 535  532          /usr/xpg4/lib/64 \
 536  533          /var/ld/64 \
 537  534          /usr/ucblib/64
 538  535  
 539  536  # prepend the ROOT prefix
 540  537  
 541  538  ROOTDIRS=       $(TARGETDIRS:%=$(ROOT)%)
 542  539  
 543  540  # conditional assignments
 544  541  #
↓ open down ↓ 87 lines elided ↑ open up ↑
 632  629  $(BUILD64) $(ROOT)/lib/secure/64:=      LINKDEST=$(MACH64)
 633  630  $(BUILD64) $(ROOT)/usr/lib/64:=         LINKDEST=$(MACH64)
 634  631  $(BUILD64) $(ROOT)/usr/lib/elfedit/64:= LINKDEST=$(MACH64)
 635  632  $(BUILD64) $(ROOT)/usr/lib/brand/lx/64:=        LINKDEST=$(MACH64)
 636  633  $(BUILD64) $(ROOT)/usr/lib/brand/sn1/64:=       LINKDEST=$(MACH64)
 637  634  $(BUILD64) $(ROOT)/usr/lib/brand/solaris10/64:= LINKDEST=$(MACH64)
 638  635  $(BUILD64) $(ROOT)/usr/lib/lwp/64:=     LINKDEST=$(MACH64)
 639  636  $(BUILD64) $(ROOT)/usr/lib/link_audit/64:=      LINKDEST=$(MACH64)
 640  637  $(BUILD64) $(ROOT)/usr/lib/secure/64:=  LINKDEST=$(MACH64)
 641  638  $(BUILD64) $(ROOT)/usr/lib/security/64:=        LINKDEST=$(MACH64)
 642      -$(BUILD64) $(ROOT)/usr/lib/varpd/64:=   LINKDEST=$(MACH64)
 643  639  $(BUILD64) $(ROOT)/usr/xpg4/lib/64:=    LINKDEST=$(MACH64)
 644  640  $(BUILD64) $(ROOT)/var/ld/64:=          LINKDEST=$(MACH64)
 645  641  $(BUILD64) $(ROOT)/usr/ucblib/64:=      LINKDEST=$(MACH64)
 646  642  
 647  643  #
 648  644  # Installing a directory symlink calls for overriding INS.dir to install
 649  645  # a symlink.
 650  646  #
 651  647  $(DIRLINKS:%=$(ROOT)%):= \
 652  648     INS.dir= -$(RM) -r $@; $(SYMLINK) $(LINKDEST) $@
↓ open down ↓ 1248 lines elided ↑ open up ↑
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX