*** 21,34 ****
  #
  # Copyright (c) 1989, 2010, Oracle and/or its affiliates. All rights reserved.
  # Copyright 2011, Richard Lowe
  # Copyright (c) 2012 by Delphix. All rights reserved.
  # Copyright (c) 2012, Igor Kozhukhov <ikozhukhov@gmail.com>
- # Copyright 2012 OmniTI Computer Consulting, Inc.  All rights reserved.
  # Copyright (c) 2013 RackTop Systems.
  # Copyright 2014 Garrett D'Amore <garrett@damore.org>
  # Copyright 2014 Nexenta Systems, Inc.  All rights reserved.
  #
  
  #
  # It is easier to think in terms of directory names without the ROOT macro
  # prefix.  ROOTDIRS is TARGETDIRS with ROOT prefixes.  It is necessary
--- 21,34 ----
  #
  # Copyright (c) 1989, 2010, Oracle and/or its affiliates. All rights reserved.
  # Copyright 2011, Richard Lowe
  # Copyright (c) 2012 by Delphix. All rights reserved.
  # Copyright (c) 2012, Igor Kozhukhov <ikozhukhov@gmail.com>
  # Copyright (c) 2013 RackTop Systems.
  # Copyright 2014 Garrett D'Amore <garrett@damore.org>
  # Copyright 2014 Nexenta Systems, Inc.  All rights reserved.
+ # Copyright 2015 OmniTI Computer Consulting, Inc.  All rights reserved.
  #
  
  #
  # It is easier to think in terms of directory names without the ROOT macro
  # prefix.  ROOTDIRS is TARGETDIRS with ROOT prefixes.  It is necessary
*** 53,63 ****
          /boot/grub/bin          \
          /platform/i86pc         \
          /lib/libmvec            \
          /usr/lib/brand/lx       \
          /usr/lib/brand/lx/amd64 \
-         /usr/lib/brand/lx/distros \
          /usr/lib/xen            \
          /usr/lib/xen/bin
  
  sparc_DIRS=                             \
          /usr/lib/ldoms
--- 53,62 ----
*** 247,256 ****
--- 246,256 ----
          /usr/kvm \
          /usr/lib \
          /usr/lib/abi \
          /usr/lib/brand \
          /usr/lib/brand/ipkg \
+         /usr/lib/brand/lipkg \
          /usr/lib/brand/labeled \
          /usr/lib/brand/shared \
          /usr/lib/brand/sn1 \
          /usr/lib/brand/solaris10 \
          /usr/lib/class \
*** 281,300 ****
          /usr/lib/lwp \
          /usr/lib/mdb \
          /usr/lib/mdb/kvm \
          /usr/lib/mdb/proc \
          /usr/lib/nfs \
-         /usr/lib/varpd \
          /usr/net \
          /usr/net/servers \
          /usr/lib/pool \
!         /usr/lib/python$(PYTHON_VERSION) \
!         /usr/lib/python$(PYTHON_VERSION)/vendor-packages \
!         /usr/lib/python$(PYTHON_VERSION)/vendor-packages/64 \
!         /usr/lib/python$(PYTHON_VERSION)/vendor-packages/solaris \
!         /usr/lib/python$(PYTHON_VERSION)/vendor-packages/zfs \
!         /usr/lib/python$(PYTHON_VERSION)/vendor-packages/beadm \
          /usr/lib/rcap \
          /usr/lib/rcap/$(MACH32) \
          /usr/lib/sa  \
          /usr/lib/saf \
          /usr/lib/sasl \
--- 281,299 ----
          /usr/lib/lwp \
          /usr/lib/mdb \
          /usr/lib/mdb/kvm \
          /usr/lib/mdb/proc \
          /usr/lib/nfs \
          /usr/net \
          /usr/net/servers \
          /usr/lib/pool \
!         /usr/lib/python2.6 \
!         /usr/lib/python2.6/vendor-packages \
!         /usr/lib/python2.6/vendor-packages/64 \
!         /usr/lib/python2.6/vendor-packages/solaris \
!         /usr/lib/python2.6/vendor-packages/zfs \
!         /usr/lib/python2.6/vendor-packages/beadm \
          /usr/lib/rcap \
          /usr/lib/rcap/$(MACH32) \
          /usr/lib/sa  \
          /usr/lib/saf \
          /usr/lib/sasl \
*** 468,478 ****
          /usr/lib/scsi/$(MACH64) \
          /usr/lib/secure/$(MACH64) \
          /usr/lib/security/$(MACH64) \
          /usr/lib/smbsrv/$(MACH64) \
          /usr/lib/abi/$(MACH64) \
-         /usr/lib/varpd/$(MACH64) \
          /usr/sbin/$(MACH64) \
          /usr/ucb/$(MACH64) \
          /usr/ucblib/$(MACH64) \
          /usr/xpg4/lib/$(MACH64) \
          /var/ld/$(MACH64)
--- 467,476 ----
*** 529,539 ****
          /usr/lib/elfedit/64 \
          /usr/lib/link_audit/64 \
          /usr/lib/lwp/64 \
          /usr/lib/secure/64 \
          /usr/lib/security/64 \
-         /usr/lib/varpd/64 \
          /usr/xpg4/lib/64 \
          /var/ld/64 \
          /usr/ucblib/64
  
  # prepend the ROOT prefix
--- 527,536 ----
*** 637,647 ****
  $(BUILD64) $(ROOT)/usr/lib/brand/solaris10/64:= LINKDEST=$(MACH64)
  $(BUILD64) $(ROOT)/usr/lib/lwp/64:=     LINKDEST=$(MACH64)
  $(BUILD64) $(ROOT)/usr/lib/link_audit/64:=      LINKDEST=$(MACH64)
  $(BUILD64) $(ROOT)/usr/lib/secure/64:=  LINKDEST=$(MACH64)
  $(BUILD64) $(ROOT)/usr/lib/security/64:=        LINKDEST=$(MACH64)
- $(BUILD64) $(ROOT)/usr/lib/varpd/64:=   LINKDEST=$(MACH64)
  $(BUILD64) $(ROOT)/usr/xpg4/lib/64:=    LINKDEST=$(MACH64)
  $(BUILD64) $(ROOT)/var/ld/64:=          LINKDEST=$(MACH64)
  $(BUILD64) $(ROOT)/usr/ucblib/64:=      LINKDEST=$(MACH64)
  
  #
--- 634,643 ----