--- old/usr/src/Targetdirs	2019-07-05 17:31:47.966966955 +0000
+++ new/usr/src/Targetdirs	2019-07-05 17:31:47.998370781 +0000
@@ -40,9 +40,6 @@
 DIRLINKS=	$(SYM.DIRS)
 $(BUILD64)	DIRLINKS += $(SYM.DIRS64)
 
-FILELINKS= $(SYM.USRCCSLIB) $(SYM.USRLIB)
-$(BUILD64)	FILELINKS += $(SYM.USRCCSLIB64) $(SYM.USRLIB64)
-
 TARGETDIRS=	$(DIRS)
 $(BUILD64)	TARGETDIRS += $(DIRS64)
 
@@ -500,9 +497,6 @@
 	/dev/stdin \
 	/dev/stdout \
 	/dev/stderr \
-	/etc/lib/ld.so.1 \
-	/etc/lib/libdl.so.1 \
-	/etc/lib/nss_files.so.1 \
 	/etc/log \
 	/lib/32 \
 	/lib/crypto/32 \
@@ -617,9 +611,6 @@
 $(ROOT)/usr/man:=			LINKDEST=share/man
 $(ROOT)/usr/src:=			LINKDEST=share/src
 $(ROOT)/usr/adm:=			LINKDEST=../var/adm
-$(ROOT)/etc/lib/ld.so.1:=		LINKDEST=../../lib/ld.so.1
-$(ROOT)/etc/lib/libdl.so.1:=		LINKDEST=../../lib/libdl.so.1
-$(ROOT)/etc/lib/nss_files.so.1:=	LINKDEST=../../lib/nss_files.so.1
 $(ROOT)/etc/log:=			LINKDEST=../var/adm/log
 $(ROOT)/usr/mail:=			LINKDEST=../var/mail
 $(ROOT)/usr/news:=			LINKDEST=../var/news
@@ -658,836 +649,3 @@
 #
 $(DIRLINKS:%=$(ROOT)%):= \
    INS.dir= -$(RM) -r $@; $(SYMLINK) $(LINKDEST) $@
-
-# Special symlinks to populate usr/ccs/lib, whose objects
-# have actually been moved to usr/lib
-# Rather than adding another set of rules, we add usr/lib/lwp files here
-$(ROOT)/usr/ccs/lib/libcurses.so:=	REALPATH=../../../lib/libcurses.so.1
-$(ROOT)/usr/ccs/lib/libform.so:=	REALPATH=../../lib/libform.so.1
-$(ROOT)/usr/ccs/lib/libgen.so:=		REALPATH=../../../lib/libgen.so.1
-$(ROOT)/usr/ccs/lib/libmalloc.so:=	REALPATH=../../lib/libmalloc.so.1
-$(ROOT)/usr/ccs/lib/libmenu.so:=	REALPATH=../../lib/libmenu.so.1
-$(ROOT)/usr/ccs/lib/libpanel.so:=	REALPATH=../../lib/libpanel.so.1
-$(ROOT)/usr/ccs/lib/libtermlib.so:=	REALPATH=../../../lib/libcurses.so.1
-$(ROOT)/usr/ccs/lib/libtermcap.so:=	REALPATH=../../../lib/libtermcap.so.1
-$(ROOT)/usr/ccs/lib/values-Xa.o:=	REALPATH=../../lib/values-Xa.o
-$(ROOT)/usr/ccs/lib/values-Xc.o:=	REALPATH=../../lib/values-Xc.o
-$(ROOT)/usr/ccs/lib/values-Xs.o:=	REALPATH=../../lib/values-Xs.o
-$(ROOT)/usr/ccs/lib/values-Xt.o:=	REALPATH=../../lib/values-Xt.o
-$(ROOT)/usr/ccs/lib/values-xpg4.o:=	REALPATH=../../lib/values-xpg4.o
-$(ROOT)/usr/ccs/lib/values-xpg6.o:=	REALPATH=../../lib/values-xpg6.o
-$(ROOT)/usr/ccs/lib/libl.so:=		REALPATH=../../lib/libl.so.1
-$(ROOT)/usr/ccs/lib/liby.so:=		REALPATH=../../lib/liby.so.1
-$(ROOT)/usr/lib/lwp/libthread.so.1:=	REALPATH=../libthread.so.1
-$(ROOT)/usr/lib/lwp/libthread_db.so.1:=	REALPATH=../libthread_db.so.1
-
-# symlinks to populate usr/ccs/lib/$(MACH64)
-$(ROOT)/usr/ccs/lib/$(MACH64)/libcurses.so:= \
-	REALPATH=../../../../lib/$(MACH64)/libcurses.so.1
-$(ROOT)/usr/ccs/lib/$(MACH64)/libform.so:= \
-	REALPATH=../../../lib/$(MACH64)/libform.so.1
-$(ROOT)/usr/ccs/lib/$(MACH64)/libgen.so:= \
-	REALPATH=../../../../lib/$(MACH64)/libgen.so.1
-$(ROOT)/usr/ccs/lib/$(MACH64)/libmalloc.so:= \
-	REALPATH=../../../lib/$(MACH64)/libmalloc.so.1
-$(ROOT)/usr/ccs/lib/$(MACH64)/libmenu.so:= \
-	REALPATH=../../../lib/$(MACH64)/libmenu.so.1
-$(ROOT)/usr/ccs/lib/$(MACH64)/libpanel.so:= \
-	REALPATH=../../../lib/$(MACH64)/libpanel.so.1
-$(ROOT)/usr/ccs/lib/$(MACH64)/libtermlib.so:= \
-	REALPATH=../../../../lib/$(MACH64)/libcurses.so.1
-$(ROOT)/usr/ccs/lib/$(MACH64)/libtermcap.so:= \
-	REALPATH=../../../../lib/$(MACH64)/libtermcap.so.1
-$(ROOT)/usr/ccs/lib/$(MACH64)/values-Xa.o:= \
-	REALPATH=../../../lib/$(MACH64)/values-Xa.o
-$(ROOT)/usr/ccs/lib/$(MACH64)/values-Xc.o:= \
-	REALPATH=../../../lib/$(MACH64)/values-Xc.o
-$(ROOT)/usr/ccs/lib/$(MACH64)/values-Xs.o:= \
-	REALPATH=../../../lib/$(MACH64)/values-Xs.o
-$(ROOT)/usr/ccs/lib/$(MACH64)/values-Xt.o:= \
-	REALPATH=../../../lib/$(MACH64)/values-Xt.o
-$(ROOT)/usr/ccs/lib/$(MACH64)/values-xpg4.o:= \
-	REALPATH=../../../lib/$(MACH64)/values-xpg4.o
-$(ROOT)/usr/ccs/lib/$(MACH64)/values-xpg6.o:= \
-	REALPATH=../../../lib/$(MACH64)/values-xpg6.o
-$(ROOT)/usr/ccs/lib/$(MACH64)/libl.so:= \
-	REALPATH=../../../lib/$(MACH64)/libl.so.1
-$(ROOT)/usr/ccs/lib/$(MACH64)/liby.so:= \
-	REALPATH=../../../lib/$(MACH64)/liby.so.1
-$(ROOT)/usr/lib/lwp/$(MACH64)/libthread.so.1:= \
-	REALPATH=../../$(MACH64)/libthread.so.1
-$(ROOT)/usr/lib/lwp/$(MACH64)/libthread_db.so.1:= \
-	REALPATH=../../$(MACH64)/libthread_db.so.1
-
-SYM.USRCCSLIB= \
-	/usr/ccs/lib/libcurses.so \
-	/usr/ccs/lib/libform.so \
-	/usr/ccs/lib/libgen.so \
-	/usr/ccs/lib/libmalloc.so \
-	/usr/ccs/lib/libmenu.so \
-	/usr/ccs/lib/libpanel.so \
-	/usr/ccs/lib/libtermlib.so \
-	/usr/ccs/lib/libtermcap.so \
-	/usr/ccs/lib/values-Xa.o \
-	/usr/ccs/lib/values-Xc.o \
-	/usr/ccs/lib/values-Xs.o \
-	/usr/ccs/lib/values-Xt.o \
-	/usr/ccs/lib/values-xpg4.o \
-	/usr/ccs/lib/values-xpg6.o \
-	/usr/ccs/lib/libl.so \
-	/usr/ccs/lib/liby.so \
-	/usr/lib/lwp/libthread.so.1 \
-	/usr/lib/lwp/libthread_db.so.1
-
-SYM.USRCCSLIB64= \
-	/usr/ccs/lib/$(MACH64)/libcurses.so \
-	/usr/ccs/lib/$(MACH64)/libform.so \
-	/usr/ccs/lib/$(MACH64)/libgen.so \
-	/usr/ccs/lib/$(MACH64)/libmalloc.so \
-	/usr/ccs/lib/$(MACH64)/libmenu.so \
-	/usr/ccs/lib/$(MACH64)/libpanel.so \
-	/usr/ccs/lib/$(MACH64)/libtermlib.so \
-	/usr/ccs/lib/$(MACH64)/libtermcap.so \
-	/usr/ccs/lib/$(MACH64)/values-Xa.o \
-	/usr/ccs/lib/$(MACH64)/values-Xc.o \
-	/usr/ccs/lib/$(MACH64)/values-Xs.o \
-	/usr/ccs/lib/$(MACH64)/values-Xt.o \
-	/usr/ccs/lib/$(MACH64)/values-xpg4.o \
-	/usr/ccs/lib/$(MACH64)/values-xpg6.o \
-	/usr/ccs/lib/$(MACH64)/libl.so \
-	/usr/ccs/lib/$(MACH64)/liby.so \
-	/usr/lib/lwp/$(MACH64)/libthread.so.1 \
-	/usr/lib/lwp/$(MACH64)/libthread_db.so.1
-
-# Special symlinks to direct libraries that have been moved
-# from /usr/lib to /lib in order to live in the root filesystem.
-$(ROOT)/lib/libposix4.so.1:=		REALPATH=librt.so.1
-$(ROOT)/lib/libposix4.so:=		REALPATH=libposix4.so.1
-$(ROOT)/lib/libthread_db.so.1:=		REALPATH=libc_db.so.1
-$(ROOT)/lib/libthread_db.so:=		REALPATH=libc_db.so.1
-$(ROOT)/usr/lib/ld.so.1:=		REALPATH=../../lib/ld.so.1
-$(ROOT)/usr/lib/libadm.so.1:=		REALPATH=../../lib/libadm.so.1
-$(ROOT)/usr/lib/libadm.so:=		REALPATH=../../lib/libadm.so.1
-$(ROOT)/usr/lib/libaio.so.1:=		REALPATH=../../lib/libaio.so.1
-$(ROOT)/usr/lib/libaio.so:=		REALPATH=../../lib/libaio.so.1
-$(ROOT)/usr/lib/libavl.so.1:=		REALPATH=../../lib/libavl.so.1
-$(ROOT)/usr/lib/libavl.so:=		REALPATH=../../lib/libavl.so.1
-$(ROOT)/usr/lib/libbsm.so.1:=		REALPATH=../../lib/libbsm.so.1
-$(ROOT)/usr/lib/libbsm.so:=		REALPATH=../../lib/libbsm.so.1
-$(ROOT)/usr/lib/libc.so.1:=		REALPATH=../../lib/libc.so.1
-$(ROOT)/usr/lib/libc.so:=		REALPATH=../../lib/libc.so.1
-$(ROOT)/usr/lib/libc_db.so.1:=		REALPATH=../../lib/libc_db.so.1
-$(ROOT)/usr/lib/libc_db.so:=		REALPATH=../../lib/libc_db.so.1
-$(ROOT)/usr/lib/libcmdutils.so.1:=	REALPATH=../../lib/libcmdutils.so.1
-$(ROOT)/usr/lib/libcmdutils.so:=	REALPATH=../../lib/libcmdutils.so.1
-$(ROOT)/usr/lib/libcontract.so.1:=	REALPATH=../../lib/libcontract.so.1
-$(ROOT)/usr/lib/libcontract.so:=	REALPATH=../../lib/libcontract.so.1
-$(ROOT)/usr/lib/libcryptoutil.so.1:=	REALPATH=../../lib/libcryptoutil.so.1
-$(ROOT)/usr/lib/libcryptoutil.so:=	REALPATH=../../lib/libcryptoutil.so.1
-$(ROOT)/usr/lib/libctf.so.1:=		REALPATH=../../lib/libctf.so.1
-$(ROOT)/usr/lib/libctf.so:=		REALPATH=../../lib/libctf.so.1
-$(ROOT)/usr/lib/libcurses.so.1:=	REALPATH=../../lib/libcurses.so.1
-$(ROOT)/usr/lib/libcurses.so:=		REALPATH=../../lib/libcurses.so.1
-$(ROOT)/usr/lib/libdevice.so.1:=	REALPATH=../../lib/libdevice.so.1
-$(ROOT)/usr/lib/libdevice.so:=		REALPATH=../../lib/libdevice.so.1
-$(ROOT)/usr/lib/libdevid.so.1:=		REALPATH=../../lib/libdevid.so.1
-$(ROOT)/usr/lib/libdevid.so:=		REALPATH=../../lib/libdevid.so.1
-$(ROOT)/usr/lib/libdevinfo.so.1:=	REALPATH=../../lib/libdevinfo.so.1
-$(ROOT)/usr/lib/libdevinfo.so:=		REALPATH=../../lib/libdevinfo.so.1
-$(ROOT)/usr/lib/libdhcpagent.so.1:=	REALPATH=../../lib/libdhcpagent.so.1
-$(ROOT)/usr/lib/libdhcpagent.so:=	REALPATH=../../lib/libdhcpagent.so.1
-$(ROOT)/usr/lib/libdhcputil.so.1:=	REALPATH=../../lib/libdhcputil.so.1
-$(ROOT)/usr/lib/libdhcputil.so:=	REALPATH=../../lib/libdhcputil.so.1
-$(ROOT)/usr/lib/libdl.so.1:=		REALPATH=../../lib/libdl.so.1
-$(ROOT)/usr/lib/libdl.so:=		REALPATH=../../lib/libdl.so.1
-$(ROOT)/usr/lib/libdlpi.so.1:=		REALPATH=../../lib/libdlpi.so.1
-$(ROOT)/usr/lib/libdlpi.so:=		REALPATH=../../lib/libdlpi.so.1
-$(ROOT)/usr/lib/libdoor.so.1:=		REALPATH=../../lib/libdoor.so.1
-$(ROOT)/usr/lib/libdoor.so:=		REALPATH=../../lib/libdoor.so.1
-$(ROOT)/usr/lib/libdwarf.so.1:=		REALPATH=../../lib/libdwarf.so.1
-$(ROOT)/usr/lib/libdwarf.so:=		REALPATH=../../lib/libdwarf.so.1
-$(ROOT)/usr/lib/libefi.so.1:=		REALPATH=../../lib/libefi.so.1
-$(ROOT)/usr/lib/libefi.so:=		REALPATH=../../lib/libefi.so.1
-$(ROOT)/usr/lib/libelf.so.1:=		REALPATH=../../lib/libelf.so.1
-$(ROOT)/usr/lib/libelf.so:=		REALPATH=../../lib/libelf.so.1
-$(ROOT)/usr/lib/libfakekernel.so.1:=	REALPATH=../../lib/libfakekernel.so.1
-$(ROOT)/usr/lib/libfakekernel.so:=	REALPATH=../../lib/libfakekernel.so.1
-$(ROOT)/usr/lib/libfdisk.so.1:=		REALPATH=../../lib/libfdisk.so.1
-$(ROOT)/usr/lib/libfdisk.so:=		REALPATH=../../lib/libfdisk.so.1
-$(ROOT)/usr/lib/libgen.so.1:=		REALPATH=../../lib/libgen.so.1
-$(ROOT)/usr/lib/libgen.so:=		REALPATH=../../lib/libgen.so.1
-$(ROOT)/usr/lib/libinetutil.so.1:=	REALPATH=../../lib/libinetutil.so.1
-$(ROOT)/usr/lib/libinetutil.so:=	REALPATH=../../lib/libinetutil.so.1
-$(ROOT)/usr/lib/libintl.so.1:=		REALPATH=../../lib/libintl.so.1
-$(ROOT)/usr/lib/libintl.so:=		REALPATH=../../lib/libintl.so.1
-$(ROOT)/usr/lib/libkmf.so.1:=		REALPATH=../../lib/libkmf.so.1
-$(ROOT)/usr/lib/libkmf.so:=		REALPATH=../../lib/libkmf.so.1
-$(ROOT)/usr/lib/libkmfberder.so.1:=	REALPATH=../../lib/libkmfberder.so.1
-$(ROOT)/usr/lib/libkmfberder.so:=	REALPATH=../../lib/libkmfberder.so.1
-$(ROOT)/usr/lib/libkstat.so.1:=		REALPATH=../../lib/libkstat.so.1
-$(ROOT)/usr/lib/libkstat.so:=		REALPATH=../../lib/libkstat.so.1
-$(ROOT)/usr/lib/liblddbg.so.4:=		REALPATH=../../lib/liblddbg.so.4
-$(ROOT)/usr/lib/libm.so.1:=		REALPATH=../../lib/libm.so.1
-$(ROOT)/usr/lib/libm.so.2:=		REALPATH=../../lib/libm.so.2
-$(ROOT)/usr/lib/libm.so:=		REALPATH=../../lib/libm.so.2
-$(ROOT)/usr/lib/libmd.so.1:=		REALPATH=../../lib/libmd.so.1
-$(ROOT)/usr/lib/libmd.so:=		REALPATH=../../lib/libmd.so.1
-$(ROOT)/usr/lib/libmd5.so.1:=		REALPATH=../../lib/libmd5.so.1
-$(ROOT)/usr/lib/libmd5.so:=		REALPATH=../../lib/libmd5.so.1
-$(ROOT)/usr/lib/libmp.so.1:=		REALPATH=../../lib/libmp.so.1
-$(ROOT)/usr/lib/libmp.so.2:=		REALPATH=../../lib/libmp.so.2
-$(ROOT)/usr/lib/libmp.so:=		REALPATH=../../lib/libmp.so.2
-$(ROOT)/usr/lib/libmvec.so.1:=		REALPATH=../../lib/libmvec.so.1
-$(ROOT)/usr/lib/libmvec.so:=		REALPATH=../../lib/libmvec.so.1
-$(ROOT)/usr/lib/libnsl.so.1:=		REALPATH=../../lib/libnsl.so.1
-$(ROOT)/usr/lib/libnsl.so:=		REALPATH=../../lib/libnsl.so.1
-$(ROOT)/usr/lib/libnvpair.so.1:=	REALPATH=../../lib/libnvpair.so.1
-$(ROOT)/usr/lib/libnvpair.so:=		REALPATH=../../lib/libnvpair.so.1
-$(ROOT)/usr/lib/libpam.so.1:=		REALPATH=../../lib/libpam.so.1
-$(ROOT)/usr/lib/libpam.so:=		REALPATH=../../lib/libpam.so.1
-$(ROOT)/usr/lib/libposix4.so.1:=	REALPATH=../../lib/librt.so.1
-$(ROOT)/usr/lib/libposix4.so:=		REALPATH=../../lib/librt.so.1
-$(ROOT)/usr/lib/libproc.so.1:=		REALPATH=../../lib/libproc.so.1
-$(ROOT)/usr/lib/libproc.so:=		REALPATH=../../lib/libproc.so.1
-$(ROOT)/usr/lib/libpthread.so.1:=	REALPATH=../../lib/libpthread.so.1
-$(ROOT)/usr/lib/libpthread.so:=		REALPATH=../../lib/libpthread.so.1
-$(ROOT)/usr/lib/librcm.so.1:=		REALPATH=../../lib/librcm.so.1
-$(ROOT)/usr/lib/librcm.so:=		REALPATH=../../lib/librcm.so.1
-$(ROOT)/usr/lib/libresolv.so.1:=	REALPATH=../../lib/libresolv.so.1
-$(ROOT)/usr/lib/libresolv.so.2:=	REALPATH=../../lib/libresolv.so.2
-$(ROOT)/usr/lib/libresolv.so:=		REALPATH=../../lib/libresolv.so.2
-$(ROOT)/usr/lib/librestart.so.1:=	REALPATH=../../lib/librestart.so.1
-$(ROOT)/usr/lib/librestart.so:=		REALPATH=../../lib/librestart.so.1
-$(ROOT)/usr/lib/librpcsvc.so.1:=	REALPATH=../../lib/librpcsvc.so.1
-$(ROOT)/usr/lib/librpcsvc.so:=		REALPATH=../../lib/librpcsvc.so.1
-$(ROOT)/usr/lib/librt.so.1:=		REALPATH=../../lib/librt.so.1
-$(ROOT)/usr/lib/librt.so:=		REALPATH=../../lib/librt.so.1
-$(ROOT)/usr/lib/librtld.so.1:=		REALPATH=../../lib/librtld.so.1
-$(ROOT)/usr/lib/librtld_db.so.1:=	REALPATH=../../lib/librtld_db.so.1
-$(ROOT)/usr/lib/librtld_db.so:=		REALPATH=../../lib/librtld_db.so.1
-$(ROOT)/usr/lib/libscf.so.1:=		REALPATH=../../lib/libscf.so.1
-$(ROOT)/usr/lib/libscf.so:=		REALPATH=../../lib/libscf.so.1
-$(ROOT)/usr/lib/libsec.so.1:=		REALPATH=../../lib/libsec.so.1
-$(ROOT)/usr/lib/libsec.so:=		REALPATH=../../lib/libsec.so.1
-$(ROOT)/usr/lib/libsecdb.so.1:=		REALPATH=../../lib/libsecdb.so.1
-$(ROOT)/usr/lib/libsecdb.so:=		REALPATH=../../lib/libsecdb.so.1
-$(ROOT)/usr/lib/libsendfile.so.1:=	REALPATH=../../lib/libsendfile.so.1
-$(ROOT)/usr/lib/libsendfile.so:=	REALPATH=../../lib/libsendfile.so.1
-$(ROOT)/usr/lib/libsocket.so.1:=	REALPATH=../../lib/libsocket.so.1
-$(ROOT)/usr/lib/libsocket.so:=		REALPATH=../../lib/libsocket.so.1
-$(ROOT)/usr/lib/libsysevent.so.1:=	REALPATH=../../lib/libsysevent.so.1
-$(ROOT)/usr/lib/libsysevent.so:=	REALPATH=../../lib/libsysevent.so.1
-$(ROOT)/usr/lib/libtermcap.so.1:=	REALPATH=../../lib/libtermcap.so.1
-$(ROOT)/usr/lib/libtermcap.so:=		REALPATH=../../lib/libtermcap.so.1
-$(ROOT)/usr/lib/libtermlib.so.1:=	REALPATH=../../lib/libcurses.so.1
-$(ROOT)/usr/lib/libtermlib.so:=		REALPATH=../../lib/libcurses.so.1
-$(ROOT)/usr/lib/libthread.so.1:=	REALPATH=../../lib/libthread.so.1
-$(ROOT)/usr/lib/libthread.so:=		REALPATH=../../lib/libthread.so.1
-$(ROOT)/usr/lib/libthread_db.so.1:=	REALPATH=../../lib/libc_db.so.1
-$(ROOT)/usr/lib/libthread_db.so:=	REALPATH=../../lib/libc_db.so.1
-$(ROOT)/usr/lib/libtsnet.so.1:=		REALPATH=../../lib/libtsnet.so.1
-$(ROOT)/usr/lib/libtsnet.so:=		REALPATH=../../lib/libtsnet.so.1
-$(ROOT)/usr/lib/libtsol.so.2:=		REALPATH=../../lib/libtsol.so.2
-$(ROOT)/usr/lib/libtsol.so:=		REALPATH=../../lib/libtsol.so.2
-$(ROOT)/usr/lib/libumem.so.1:=		REALPATH=../../lib/libumem.so.1
-$(ROOT)/usr/lib/libumem.so:=		REALPATH=../../lib/libumem.so.1
-$(ROOT)/usr/lib/libuuid.so.1:=		REALPATH=../../lib/libuuid.so.1
-$(ROOT)/usr/lib/libuuid.so:=		REALPATH=../../lib/libuuid.so.1
-$(ROOT)/usr/lib/libuutil.so.1:=		REALPATH=../../lib/libuutil.so.1
-$(ROOT)/usr/lib/libuutil.so:=		REALPATH=../../lib/libuutil.so.1
-$(ROOT)/usr/lib/libw.so.1:=		REALPATH=../../lib/libw.so.1
-$(ROOT)/usr/lib/libw.so:=		REALPATH=../../lib/libw.so.1
-$(ROOT)/usr/lib/libxnet.so.1:=		REALPATH=../../lib/libxnet.so.1
-$(ROOT)/usr/lib/libxnet.so:=		REALPATH=../../lib/libxnet.so.1
-$(ROOT)/usr/lib/libzfs.so.1:=		REALPATH=../../lib/libzfs.so.1
-$(ROOT)/usr/lib/libzfs.so:=		REALPATH=../../lib/libzfs.so.1
-$(ROOT)/usr/lib/libzfs_core.so.1:=	REALPATH=../../lib/libzfs_core.so.1
-$(ROOT)/usr/lib/libzfs_core.so:=	REALPATH=../../lib/libzfs_core.so.1
-$(ROOT)/usr/lib/nss_compat.so.1:=	REALPATH=../../lib/nss_compat.so.1
-$(ROOT)/usr/lib/nss_dns.so.1:=		REALPATH=../../lib/nss_dns.so.1
-$(ROOT)/usr/lib/nss_files.so.1:=	REALPATH=../../lib/nss_files.so.1
-$(ROOT)/usr/lib/nss_nis.so.1:=		REALPATH=../../lib/nss_nis.so.1
-$(ROOT)/usr/lib/nss_user.so.1:=		REALPATH=../../lib/nss_user.so.1
-$(ROOT)/usr/lib/fm/libfmevent.so.1:=    REALPATH=../../../lib/fm/libfmevent.so.1
-$(ROOT)/usr/lib/fm/libfmevent.so:=      REALPATH=../../../lib/fm/libfmevent.so.1
-
-$(ROOT)/lib/$(MACH64)/libposix4.so.1:= \
-	REALPATH=librt.so.1
-$(ROOT)/lib/$(MACH64)/libposix4.so:= \
-	REALPATH=libposix4.so.1
-$(ROOT)/lib/$(MACH64)/libthread_db.so.1:= \
-	REALPATH=libc_db.so.1
-$(ROOT)/lib/$(MACH64)/libthread_db.so:= \
-	REALPATH=libc_db.so.1
-$(ROOT)/usr/lib/$(MACH64)/ld.so.1:= \
-	REALPATH=../../../lib/$(MACH64)/ld.so.1
-$(ROOT)/usr/lib/$(MACH64)/libadm.so.1:= \
-	REALPATH=../../../lib/$(MACH64)/libadm.so.1
-$(ROOT)/usr/lib/$(MACH64)/libadm.so:= \
-	REALPATH=../../../lib/$(MACH64)/libadm.so.1
-$(ROOT)/usr/lib/$(MACH64)/libaio.so.1:= \
-	REALPATH=../../../lib/$(MACH64)/libaio.so.1
-$(ROOT)/usr/lib/$(MACH64)/libaio.so:= \
-	REALPATH=../../../lib/$(MACH64)/libaio.so.1
-$(ROOT)/usr/lib/$(MACH64)/libavl.so.1:= \
-	REALPATH=../../../lib/$(MACH64)/libavl.so.1
-$(ROOT)/usr/lib/$(MACH64)/libavl.so:= \
-	REALPATH=../../../lib/$(MACH64)/libavl.so.1
-$(ROOT)/usr/lib/$(MACH64)/libbsm.so.1:= \
-	REALPATH=../../../lib/$(MACH64)/libbsm.so.1
-$(ROOT)/usr/lib/$(MACH64)/libbsm.so:= \
-	REALPATH=../../../lib/$(MACH64)/libbsm.so.1
-$(ROOT)/usr/lib/$(MACH64)/libc.so.1:= \
-	REALPATH=../../../lib/$(MACH64)/libc.so.1
-$(ROOT)/usr/lib/$(MACH64)/libc.so:= \
-	REALPATH=../../../lib/$(MACH64)/libc.so.1
-$(ROOT)/usr/lib/$(MACH64)/libc_db.so.1:= \
-	REALPATH=../../../lib/$(MACH64)/libc_db.so.1
-$(ROOT)/usr/lib/$(MACH64)/libc_db.so:= \
-	REALPATH=../../../lib/$(MACH64)/libc_db.so.1
-$(ROOT)/usr/lib/$(MACH64)/libcmdutils.so.1:= \
-	REALPATH=../../../lib/$(MACH64)/libcmdutils.so.1
-$(ROOT)/usr/lib/$(MACH64)/libcmdutils.so:= \
-	REALPATH=../../../lib/$(MACH64)/libcmdutils.so.1
-$(ROOT)/usr/lib/$(MACH64)/libcontract.so.1:= \
-	REALPATH=../../../lib/$(MACH64)/libcontract.so.1
-$(ROOT)/usr/lib/$(MACH64)/libcontract.so:= \
-	REALPATH=../../../lib/$(MACH64)/libcontract.so.1
-$(ROOT)/usr/lib/$(MACH64)/libctf.so.1:= \
-	REALPATH=../../../lib/$(MACH64)/libctf.so.1
-$(ROOT)/usr/lib/$(MACH64)/libctf.so:= \
-	REALPATH=../../../lib/$(MACH64)/libctf.so.1
-$(ROOT)/usr/lib/$(MACH64)/libcurses.so.1:= \
-	REALPATH=../../../lib/$(MACH64)/libcurses.so.1
-$(ROOT)/usr/lib/$(MACH64)/libcurses.so:= \
-	REALPATH=../../../lib/$(MACH64)/libcurses.so.1
-$(ROOT)/usr/lib/$(MACH64)/libdevice.so.1:= \
-	REALPATH=../../../lib/$(MACH64)/libdevice.so.1
-$(ROOT)/usr/lib/$(MACH64)/libdevice.so:= \
-	REALPATH=../../../lib/$(MACH64)/libdevice.so.1
-$(ROOT)/usr/lib/$(MACH64)/libdevid.so.1:= \
-	REALPATH=../../../lib/$(MACH64)/libdevid.so.1
-$(ROOT)/usr/lib/$(MACH64)/libdevid.so:= \
-	REALPATH=../../../lib/$(MACH64)/libdevid.so.1
-$(ROOT)/usr/lib/$(MACH64)/libdevinfo.so.1:= \
-	REALPATH=../../../lib/$(MACH64)/libdevinfo.so.1
-$(ROOT)/usr/lib/$(MACH64)/libdevinfo.so:= \
-	REALPATH=../../../lib/$(MACH64)/libdevinfo.so.1
-$(ROOT)/usr/lib/$(MACH64)/libdhcputil.so.1:= \
-	REALPATH=../../../lib/$(MACH64)/libdhcputil.so.1
-$(ROOT)/usr/lib/$(MACH64)/libdhcputil.so:= \
-	REALPATH=../../../lib/$(MACH64)/libdhcputil.so.1
-$(ROOT)/usr/lib/$(MACH64)/libdl.so.1:= \
-	REALPATH=../../../lib/$(MACH64)/libdl.so.1
-$(ROOT)/usr/lib/$(MACH64)/libdl.so:= \
-	REALPATH=../../../lib/$(MACH64)/libdl.so.1
-$(ROOT)/usr/lib/$(MACH64)/libdlpi.so.1:= \
-	REALPATH=../../../lib/$(MACH64)/libdlpi.so.1
-$(ROOT)/usr/lib/$(MACH64)/libdlpi.so:= \
-	REALPATH=../../../lib/$(MACH64)/libdlpi.so.1
-$(ROOT)/usr/lib/$(MACH64)/libdoor.so.1:= \
-	REALPATH=../../../lib/$(MACH64)/libdoor.so.1
-$(ROOT)/usr/lib/$(MACH64)/libdoor.so:= \
-	REALPATH=../../../lib/$(MACH64)/libdoor.so.1
-$(ROOT)/usr/lib/$(MACH64)/libdwarf.so.1:= \
-	REALPATH=../../../lib/$(MACH64)/libdwarf.so.1
-$(ROOT)/usr/lib/$(MACH64)/libdwarf.so:= \
-	REALPATH=../../../lib/$(MACH64)/libdwarf.so.1
-$(ROOT)/usr/lib/$(MACH64)/libefi.so.1:= \
-	REALPATH=../../../lib/$(MACH64)/libefi.so.1
-$(ROOT)/usr/lib/$(MACH64)/libefi.so:= \
-	REALPATH=../../../lib/$(MACH64)/libefi.so.1
-$(ROOT)/usr/lib/$(MACH64)/libelf.so.1:= \
-	REALPATH=../../../lib/$(MACH64)/libelf.so.1
-$(ROOT)/usr/lib/$(MACH64)/libelf.so:= \
-	REALPATH=../../../lib/$(MACH64)/libelf.so.1
-$(ROOT)/usr/lib/$(MACH64)/libgen.so.1:= \
-	REALPATH=../../../lib/$(MACH64)/libgen.so.1
-$(ROOT)/usr/lib/$(MACH64)/libgen.so:= \
-	REALPATH=../../../lib/$(MACH64)/libgen.so.1
-$(ROOT)/usr/lib/$(MACH64)/libinetutil.so.1:= \
-	REALPATH=../../../lib/$(MACH64)/libinetutil.so.1
-$(ROOT)/usr/lib/$(MACH64)/libinetutil.so:= \
-	REALPATH=../../../lib/$(MACH64)/libinetutil.so.1
-$(ROOT)/usr/lib/$(MACH64)/libintl.so.1:= \
-	REALPATH=../../../lib/$(MACH64)/libintl.so.1
-$(ROOT)/usr/lib/$(MACH64)/libintl.so:= \
-	REALPATH=../../../lib/$(MACH64)/libintl.so.1
-$(ROOT)/usr/lib/$(MACH64)/libkstat.so.1:= \
-	REALPATH=../../../lib/$(MACH64)/libkstat.so.1
-$(ROOT)/usr/lib/$(MACH64)/libkstat.so:= \
-	REALPATH=../../../lib/$(MACH64)/libkstat.so.1
-$(ROOT)/usr/lib/$(MACH64)/liblddbg.so.4:= \
-	REALPATH=../../../lib/$(MACH64)/liblddbg.so.4
-$(ROOT)/usr/lib/$(MACH64)/libm.so.1:= \
-	REALPATH=../../../lib/$(MACH64)/libm.so.1
-$(ROOT)/usr/lib/$(MACH64)/libm.so.2:= \
-	REALPATH=../../../lib/$(MACH64)/libm.so.2
-$(ROOT)/usr/lib/$(MACH64)/libm.so:= \
-	REALPATH=../../../lib/$(MACH64)/libm.so.2
-$(ROOT)/usr/lib/$(MACH64)/libmd.so.1:= \
-	REALPATH=../../../lib/$(MACH64)/libmd.so.1
-$(ROOT)/usr/lib/$(MACH64)/libmd.so:= \
-	REALPATH=../../../lib/$(MACH64)/libmd.so.1
-$(ROOT)/usr/lib/$(MACH64)/libmd5.so.1:= \
-	REALPATH=../../../lib/$(MACH64)/libmd5.so.1
-$(ROOT)/usr/lib/$(MACH64)/libmd5.so:= \
-	REALPATH=../../../lib/$(MACH64)/libmd5.so.1
-$(ROOT)/usr/lib/$(MACH64)/libmp.so.2:= \
-	REALPATH=../../../lib/$(MACH64)/libmp.so.2
-$(ROOT)/usr/lib/$(MACH64)/libmp.so:= \
-	REALPATH=../../../lib/$(MACH64)/libmp.so.2
-$(ROOT)/usr/lib/$(MACH64)/libmvec.so.1:= \
-	REALPATH=../../../lib/$(MACH64)/libmvec.so.1
-$(ROOT)/usr/lib/$(MACH64)/libmvec.so:= \
-	REALPATH=../../../lib/$(MACH64)/libmvec.so.1
-$(ROOT)/usr/lib/$(MACH64)/libnsl.so.1:= \
-	REALPATH=../../../lib/$(MACH64)/libnsl.so.1
-$(ROOT)/usr/lib/$(MACH64)/libnsl.so:= \
-	REALPATH=../../../lib/$(MACH64)/libnsl.so.1
-$(ROOT)/usr/lib/$(MACH64)/libnvpair.so.1:= \
-	REALPATH=../../../lib/$(MACH64)/libnvpair.so.1
-$(ROOT)/usr/lib/$(MACH64)/libnvpair.so:= \
-	REALPATH=../../../lib/$(MACH64)/libnvpair.so.1
-$(ROOT)/usr/lib/$(MACH64)/libpam.so.1:= \
-	REALPATH=../../../lib/$(MACH64)/libpam.so.1
-$(ROOT)/usr/lib/$(MACH64)/libpam.so:= \
-	REALPATH=../../../lib/$(MACH64)/libpam.so.1
-$(ROOT)/usr/lib/$(MACH64)/libposix4.so.1:= \
-	REALPATH=../../../lib/$(MACH64)/librt.so.1
-$(ROOT)/usr/lib/$(MACH64)/libposix4.so:= \
-	REALPATH=../../../lib/$(MACH64)/librt.so.1
-$(ROOT)/usr/lib/$(MACH64)/libproc.so.1:= \
-	REALPATH=../../../lib/$(MACH64)/libproc.so.1
-$(ROOT)/usr/lib/$(MACH64)/libproc.so:= \
-	REALPATH=../../../lib/$(MACH64)/libproc.so.1
-$(ROOT)/usr/lib/$(MACH64)/libpthread.so.1:= \
-	REALPATH=../../../lib/$(MACH64)/libpthread.so.1
-$(ROOT)/usr/lib/$(MACH64)/libpthread.so:= \
-	REALPATH=../../../lib/$(MACH64)/libpthread.so.1
-$(ROOT)/usr/lib/$(MACH64)/librcm.so.1:= \
-	REALPATH=../../../lib/$(MACH64)/librcm.so.1
-$(ROOT)/usr/lib/$(MACH64)/librcm.so:= \
-	REALPATH=../../../lib/$(MACH64)/librcm.so.1
-$(ROOT)/usr/lib/$(MACH64)/libresolv.so.2:= \
-	REALPATH=../../../lib/$(MACH64)/libresolv.so.2
-$(ROOT)/usr/lib/$(MACH64)/libresolv.so:= \
-	REALPATH=../../../lib/$(MACH64)/libresolv.so.2
-$(ROOT)/usr/lib/$(MACH64)/librestart.so.1:= \
-	REALPATH=../../../lib/$(MACH64)/librestart.so.1
-$(ROOT)/usr/lib/$(MACH64)/librestart.so:= \
-	REALPATH=../../../lib/$(MACH64)/librestart.so.1
-$(ROOT)/usr/lib/$(MACH64)/librpcsvc.so.1:= \
-	REALPATH=../../../lib/$(MACH64)/librpcsvc.so.1
-$(ROOT)/usr/lib/$(MACH64)/librpcsvc.so:= \
-	REALPATH=../../../lib/$(MACH64)/librpcsvc.so.1
-$(ROOT)/usr/lib/$(MACH64)/librt.so.1:= \
-	REALPATH=../../../lib/$(MACH64)/librt.so.1
-$(ROOT)/usr/lib/$(MACH64)/librt.so:= \
-	REALPATH=../../../lib/$(MACH64)/librt.so.1
-$(ROOT)/usr/lib/$(MACH64)/librtld.so.1:= \
-	REALPATH=../../../lib/$(MACH64)/librtld.so.1
-$(ROOT)/usr/lib/$(MACH64)/librtld_db.so.1:= \
-	REALPATH=../../../lib/$(MACH64)/librtld_db.so.1
-$(ROOT)/usr/lib/$(MACH64)/librtld_db.so:= \
-	REALPATH=../../../lib/$(MACH64)/librtld_db.so.1
-$(ROOT)/usr/lib/$(MACH64)/libscf.so.1:= \
-	REALPATH=../../../lib/$(MACH64)/libscf.so.1
-$(ROOT)/usr/lib/$(MACH64)/libscf.so:= \
-	REALPATH=../../../lib/$(MACH64)/libscf.so.1
-$(ROOT)/usr/lib/$(MACH64)/libsec.so.1:= \
-	REALPATH=../../../lib/$(MACH64)/libsec.so.1
-$(ROOT)/usr/lib/$(MACH64)/libsec.so:= \
-	REALPATH=../../../lib/$(MACH64)/libsec.so.1
-$(ROOT)/usr/lib/$(MACH64)/libsecdb.so.1:= \
-	REALPATH=../../../lib/$(MACH64)/libsecdb.so.1
-$(ROOT)/usr/lib/$(MACH64)/libsecdb.so:= \
-	REALPATH=../../../lib/$(MACH64)/libsecdb.so.1
-$(ROOT)/usr/lib/$(MACH64)/libsendfile.so.1:= \
-	REALPATH=../../../lib/$(MACH64)/libsendfile.so.1
-$(ROOT)/usr/lib/$(MACH64)/libsendfile.so:= \
-	REALPATH=../../../lib/$(MACH64)/libsendfile.so.1
-$(ROOT)/usr/lib/$(MACH64)/libsocket.so.1:= \
-	REALPATH=../../../lib/$(MACH64)/libsocket.so.1
-$(ROOT)/usr/lib/$(MACH64)/libsocket.so:= \
-	REALPATH=../../../lib/$(MACH64)/libsocket.so.1
-$(ROOT)/usr/lib/$(MACH64)/libsysevent.so.1:= \
-	REALPATH=../../../lib/$(MACH64)/libsysevent.so.1
-$(ROOT)/usr/lib/$(MACH64)/libsysevent.so:= \
-	REALPATH=../../../lib/$(MACH64)/libsysevent.so.1
-$(ROOT)/usr/lib/$(MACH64)/libtermcap.so.1:= \
-	REALPATH=../../../lib/$(MACH64)/libtermcap.so.1
-$(ROOT)/usr/lib/$(MACH64)/libtermcap.so:= \
-	REALPATH=../../../lib/$(MACH64)/libtermcap.so.1
-$(ROOT)/usr/lib/$(MACH64)/libtermlib.so.1:= \
-	REALPATH=../../../lib/$(MACH64)/libcurses.so.1
-$(ROOT)/usr/lib/$(MACH64)/libtermlib.so:= \
-	REALPATH=../../../lib/$(MACH64)/libcurses.so.1
-$(ROOT)/usr/lib/$(MACH64)/libthread.so.1:= \
-	REALPATH=../../../lib/$(MACH64)/libthread.so.1
-$(ROOT)/usr/lib/$(MACH64)/libthread.so:= \
-	REALPATH=../../../lib/$(MACH64)/libthread.so.1
-$(ROOT)/usr/lib/$(MACH64)/libthread_db.so.1:= \
-	REALPATH=../../../lib/$(MACH64)/libc_db.so.1
-$(ROOT)/usr/lib/$(MACH64)/libthread_db.so:= \
-	REALPATH=../../../lib/$(MACH64)/libc_db.so.1
-$(ROOT)/usr/lib/$(MACH64)/libtsnet.so.1:= \
-	REALPATH=../../../lib/$(MACH64)/libtsnet.so.1
-$(ROOT)/usr/lib/$(MACH64)/libtsnet.so:= \
-	REALPATH=../../../lib/$(MACH64)/libtsnet.so.1
-$(ROOT)/usr/lib/$(MACH64)/libtsol.so.2:= \
-	REALPATH=../../../lib/$(MACH64)/libtsol.so.2
-$(ROOT)/usr/lib/$(MACH64)/libtsol.so:= \
-	REALPATH=../../../lib/$(MACH64)/libtsol.so.2
-$(ROOT)/usr/lib/$(MACH64)/libumem.so.1:= \
-	REALPATH=../../../lib/$(MACH64)/libumem.so.1
-$(ROOT)/usr/lib/$(MACH64)/libumem.so:= \
-	REALPATH=../../../lib/$(MACH64)/libumem.so.1
-$(ROOT)/usr/lib/$(MACH64)/libuuid.so.1:= \
-	REALPATH=../../../lib/$(MACH64)/libuuid.so.1
-$(ROOT)/usr/lib/$(MACH64)/libuuid.so:= \
-	REALPATH=../../../lib/$(MACH64)/libuuid.so.1
-$(ROOT)/usr/lib/$(MACH64)/libuutil.so.1:= \
-	REALPATH=../../../lib/$(MACH64)/libuutil.so.1
-$(ROOT)/usr/lib/$(MACH64)/libuutil.so:= \
-	REALPATH=../../../lib/$(MACH64)/libuutil.so.1
-$(ROOT)/usr/lib/$(MACH64)/libw.so.1:= \
-	REALPATH=../../../lib/$(MACH64)/libw.so.1
-$(ROOT)/usr/lib/$(MACH64)/libw.so:= \
-	REALPATH=../../../lib/$(MACH64)/libw.so.1
-$(ROOT)/usr/lib/$(MACH64)/libxnet.so.1:= \
-	REALPATH=../../../lib/$(MACH64)/libxnet.so.1
-$(ROOT)/usr/lib/$(MACH64)/libxnet.so:= \
-	REALPATH=../../../lib/$(MACH64)/libxnet.so.1
-$(ROOT)/usr/lib/$(MACH64)/libzfs.so:= \
-	REALPATH=../../../lib/$(MACH64)/libzfs.so.1
-$(ROOT)/usr/lib/$(MACH64)/libzfs.so.1:= \
-	REALPATH=../../../lib/$(MACH64)/libzfs.so.1
-$(ROOT)/usr/lib/$(MACH64)/libzfs_core.so:= \
-	REALPATH=../../../lib/$(MACH64)/libzfs_core.so.1
-$(ROOT)/usr/lib/$(MACH64)/libzfs_core.so.1:= \
-	REALPATH=../../../lib/$(MACH64)/libzfs_core.so.1
-$(ROOT)/usr/lib/$(MACH64)/libfakekernel.so:= \
-	REALPATH=../../../lib/$(MACH64)/libfakekernel.so.1
-$(ROOT)/usr/lib/$(MACH64)/libfakekernel.so.1:= \
-	REALPATH=../../../lib/$(MACH64)/libfakekernel.so.1
-$(ROOT)/usr/lib/$(MACH64)/libfdisk.so.1:= \
-	REALPATH=../../../lib/$(MACH64)/libfdisk.so.1
-$(ROOT)/usr/lib/$(MACH64)/libfdisk.so:= \
-	REALPATH=../../../lib/$(MACH64)/libfdisk.so.1
-$(ROOT)/usr/lib/$(MACH64)/nss_compat.so.1:= \
-	REALPATH=../../../lib/$(MACH64)/nss_compat.so.1
-$(ROOT)/usr/lib/$(MACH64)/nss_dns.so.1:= \
-	REALPATH=../../../lib/$(MACH64)/nss_dns.so.1
-$(ROOT)/usr/lib/$(MACH64)/nss_files.so.1:= \
-	REALPATH=../../../lib/$(MACH64)/nss_files.so.1
-$(ROOT)/usr/lib/$(MACH64)/nss_nis.so.1:= \
-	REALPATH=../../../lib/$(MACH64)/nss_nis.so.1
-$(ROOT)/usr/lib/$(MACH64)/nss_user.so.1:= \
-	REALPATH=../../../lib/$(MACH64)/nss_user.so.1
-$(ROOT)/usr/lib/fm/$(MACH64)/libfmevent.so.1:= \
-	REALPATH=../../../../lib/fm/$(MACH64)/libfmevent.so.1
-$(ROOT)/usr/lib/fm/$(MACH64)/libfmevent.so:= \
-	REALPATH=../../../../lib/fm/$(MACH64)/libfmevent.so.1
-
-i386_SYM.USRLIB= \
-	/usr/lib/libfdisk.so \
-	/usr/lib/libfdisk.so.1
-
-SYM.USRLIB= \
-	$($(MACH)_SYM.USRLIB)	\
-	/lib/libposix4.so \
-	/lib/libposix4.so.1 \
-	/lib/libthread_db.so \
-	/lib/libthread_db.so.1 \
-	/usr/lib/ld.so.1 \
-	/usr/lib/libadm.so \
-	/usr/lib/libadm.so.1 \
-	/usr/lib/libaio.so \
-	/usr/lib/libaio.so.1 \
-	/usr/lib/libavl.so \
-	/usr/lib/libavl.so.1 \
-	/usr/lib/libbsm.so \
-	/usr/lib/libbsm.so.1 \
-	/usr/lib/libc.so \
-	/usr/lib/libc.so.1 \
-	/usr/lib/libc_db.so \
-	/usr/lib/libc_db.so.1 \
-	/usr/lib/libcmdutils.so \
-	/usr/lib/libcmdutils.so.1 \
-	/usr/lib/libcontract.so \
-	/usr/lib/libcontract.so.1 \
-	/usr/lib/libctf.so \
-	/usr/lib/libctf.so.1 \
-	/usr/lib/libcurses.so \
-	/usr/lib/libcurses.so.1 \
-	/usr/lib/libdevice.so \
-	/usr/lib/libdevice.so.1 \
-	/usr/lib/libdevid.so \
-	/usr/lib/libdevid.so.1 \
-	/usr/lib/libdevinfo.so \
-	/usr/lib/libdevinfo.so.1 \
-	/usr/lib/libdhcpagent.so \
-	/usr/lib/libdhcpagent.so.1 \
-	/usr/lib/libdhcputil.so \
-	/usr/lib/libdhcputil.so.1 \
-	/usr/lib/libdl.so \
-	/usr/lib/libdl.so.1 \
-	/usr/lib/libdlpi.so \
-	/usr/lib/libdlpi.so.1 \
-	/usr/lib/libdoor.so \
-	/usr/lib/libdoor.so.1 \
-	/usr/lib/libdwarf.so \
-	/usr/lib/libdwarf.so.1 \
-	/usr/lib/libefi.so \
-	/usr/lib/libefi.so.1 \
-	/usr/lib/libelf.so \
-	/usr/lib/libelf.so.1 \
-	/usr/lib/libfakekernel.so \
-	/usr/lib/libfakekernel.so.1 \
-	/usr/lib/libgen.so \
-	/usr/lib/libgen.so.1 \
-	/usr/lib/libinetutil.so \
-	/usr/lib/libinetutil.so.1 \
-	/usr/lib/libintl.so \
-	/usr/lib/libintl.so.1 \
-	/usr/lib/libkstat.so \
-	/usr/lib/libkstat.so.1 \
-	/usr/lib/liblddbg.so.4 \
-	/usr/lib/libm.so.1 \
-	/usr/lib/libm.so.2 \
-	/usr/lib/libm.so \
-	/usr/lib/libmd.so \
-	/usr/lib/libmd.so.1 \
-	/usr/lib/libmd5.so \
-	/usr/lib/libmd5.so.1 \
-	/usr/lib/libmp.so \
-	/usr/lib/libmp.so.1 \
-	/usr/lib/libmp.so.2 \
-	/usr/lib/libmvec.so.1 \
-	/usr/lib/libmvec.so \
-	/usr/lib/libnsl.so \
-	/usr/lib/libnsl.so.1 \
-	/usr/lib/libnvpair.so \
-	/usr/lib/libnvpair.so.1 \
-	/usr/lib/libpam.so \
-	/usr/lib/libpam.so.1 \
-	/usr/lib/libposix4.so \
-	/usr/lib/libposix4.so.1 \
-	/usr/lib/libproc.so \
-	/usr/lib/libproc.so.1 \
-	/usr/lib/libpthread.so \
-	/usr/lib/libpthread.so.1 \
-	/usr/lib/librcm.so \
-	/usr/lib/librcm.so.1 \
-	/usr/lib/libresolv.so \
-	/usr/lib/libresolv.so.1 \
-	/usr/lib/libresolv.so.2 \
-	/usr/lib/librestart.so \
-	/usr/lib/librestart.so.1 \
-	/usr/lib/librpcsvc.so \
-	/usr/lib/librpcsvc.so.1 \
-	/usr/lib/librt.so \
-	/usr/lib/librt.so.1 \
-	/usr/lib/librtld.so.1 \
-	/usr/lib/librtld_db.so \
-	/usr/lib/librtld_db.so.1 \
-	/usr/lib/libscf.so \
-	/usr/lib/libscf.so.1 \
-	/usr/lib/libsec.so \
-	/usr/lib/libsec.so.1 \
-	/usr/lib/libsecdb.so \
-	/usr/lib/libsecdb.so.1 \
-	/usr/lib/libsendfile.so \
-	/usr/lib/libsendfile.so.1 \
-	/usr/lib/libsocket.so \
-	/usr/lib/libsocket.so.1 \
-	/usr/lib/libsysevent.so \
-	/usr/lib/libsysevent.so.1 \
-	/usr/lib/libtermcap.so \
-	/usr/lib/libtermcap.so.1 \
-	/usr/lib/libtermlib.so \
-	/usr/lib/libtermlib.so.1 \
-	/usr/lib/libthread.so \
-	/usr/lib/libthread.so.1 \
-	/usr/lib/libthread_db.so \
-	/usr/lib/libthread_db.so.1 \
-	/usr/lib/libtsnet.so \
-	/usr/lib/libtsnet.so.1 \
-	/usr/lib/libtsol.so \
-	/usr/lib/libtsol.so.2 \
-	/usr/lib/libumem.so \
-	/usr/lib/libumem.so.1 \
-	/usr/lib/libuuid.so \
-	/usr/lib/libuuid.so.1 \
-	/usr/lib/libuutil.so \
-	/usr/lib/libuutil.so.1 \
-	/usr/lib/libw.so \
-	/usr/lib/libw.so.1 \
-	/usr/lib/libxnet.so \
-	/usr/lib/libxnet.so.1 \
-	/usr/lib/libzfs.so \
-	/usr/lib/libzfs.so.1 \
-	/usr/lib/libzfs_core.so \
-	/usr/lib/libzfs_core.so.1 \
-	/usr/lib/nss_compat.so.1 \
-	/usr/lib/nss_dns.so.1 \
-	/usr/lib/nss_files.so.1 \
-	/usr/lib/nss_nis.so.1 \
-	/usr/lib/nss_user.so.1 \
-	/usr/lib/fm/libfmevent.so \
-	/usr/lib/fm/libfmevent.so.1
-
-sparcv9_SYM.USRLIB64=
-
-amd64_SYM.USRLIB64=	\
-	/usr/lib/amd64/libfdisk.so	\
-	/usr/lib/amd64/libfdisk.so.1
-
-
-SYM.USRLIB64= \
-	$($(MACH64)_SYM.USRLIB64)		\
-	/lib/$(MACH64)/libposix4.so \
-	/lib/$(MACH64)/libposix4.so.1 \
-	/lib/$(MACH64)/libthread_db.so \
-	/lib/$(MACH64)/libthread_db.so.1 \
-	/usr/lib/$(MACH64)/ld.so.1 \
-	/usr/lib/$(MACH64)/libadm.so \
-	/usr/lib/$(MACH64)/libadm.so.1 \
-	/usr/lib/$(MACH64)/libaio.so \
-	/usr/lib/$(MACH64)/libaio.so.1 \
-	/usr/lib/$(MACH64)/libavl.so \
-	/usr/lib/$(MACH64)/libavl.so.1 \
-	/usr/lib/$(MACH64)/libbsm.so \
-	/usr/lib/$(MACH64)/libbsm.so.1 \
-	/usr/lib/$(MACH64)/libc.so \
-	/usr/lib/$(MACH64)/libc.so.1 \
-	/usr/lib/$(MACH64)/libc_db.so \
-	/usr/lib/$(MACH64)/libc_db.so.1 \
-	/usr/lib/$(MACH64)/libcmdutils.so \
-	/usr/lib/$(MACH64)/libcmdutils.so.1 \
-	/usr/lib/$(MACH64)/libcontract.so \
-	/usr/lib/$(MACH64)/libcontract.so.1 \
-	/usr/lib/$(MACH64)/libctf.so \
-	/usr/lib/$(MACH64)/libctf.so.1 \
-	/usr/lib/$(MACH64)/libcurses.so \
-	/usr/lib/$(MACH64)/libcurses.so.1 \
-	/usr/lib/$(MACH64)/libdevice.so \
-	/usr/lib/$(MACH64)/libdevice.so.1 \
-	/usr/lib/$(MACH64)/libdevid.so \
-	/usr/lib/$(MACH64)/libdevid.so.1 \
-	/usr/lib/$(MACH64)/libdevinfo.so \
-	/usr/lib/$(MACH64)/libdevinfo.so.1 \
-	/usr/lib/$(MACH64)/libdhcputil.so \
-	/usr/lib/$(MACH64)/libdhcputil.so.1 \
-	/usr/lib/$(MACH64)/libdl.so \
-	/usr/lib/$(MACH64)/libdl.so.1 \
-	/usr/lib/$(MACH64)/libdlpi.so \
-	/usr/lib/$(MACH64)/libdlpi.so.1 \
-	/usr/lib/$(MACH64)/libdoor.so \
-	/usr/lib/$(MACH64)/libdoor.so.1 \
-	/usr/lib/$(MACH64)/libdwarf.so \
-	/usr/lib/$(MACH64)/libdwarf.so.1 \
-	/usr/lib/$(MACH64)/libefi.so \
-	/usr/lib/$(MACH64)/libefi.so.1 \
-	/usr/lib/$(MACH64)/libelf.so \
-	/usr/lib/$(MACH64)/libelf.so.1 \
-	/usr/lib/$(MACH64)/libfakekernel.so \
-	/usr/lib/$(MACH64)/libfakekernel.so.1 \
-	/usr/lib/$(MACH64)/libgen.so \
-	/usr/lib/$(MACH64)/libgen.so.1 \
-	/usr/lib/$(MACH64)/libinetutil.so \
-	/usr/lib/$(MACH64)/libinetutil.so.1 \
-	/usr/lib/$(MACH64)/libintl.so \
-	/usr/lib/$(MACH64)/libintl.so.1 \
-	/usr/lib/$(MACH64)/libkstat.so \
-	/usr/lib/$(MACH64)/libkstat.so.1 \
-	/usr/lib/$(MACH64)/liblddbg.so.4 \
-	/usr/lib/$(MACH64)/libm.so.1 \
-	/usr/lib/$(MACH64)/libm.so.2 \
-	/usr/lib/$(MACH64)/libm.so \
-	/usr/lib/$(MACH64)/libmd.so \
-	/usr/lib/$(MACH64)/libmd.so.1 \
-	/usr/lib/$(MACH64)/libmd5.so \
-	/usr/lib/$(MACH64)/libmd5.so.1 \
-	/usr/lib/$(MACH64)/libmp.so \
-	/usr/lib/$(MACH64)/libmp.so.2 \
-	/usr/lib/$(MACH64)/libmvec.so.1 \
-	/usr/lib/$(MACH64)/libmvec.so \
-	/usr/lib/$(MACH64)/libnsl.so \
-	/usr/lib/$(MACH64)/libnsl.so.1 \
-	/usr/lib/$(MACH64)/libnvpair.so \
-	/usr/lib/$(MACH64)/libnvpair.so.1 \
-	/usr/lib/$(MACH64)/libpam.so \
-	/usr/lib/$(MACH64)/libpam.so.1 \
-	/usr/lib/$(MACH64)/libposix4.so \
-	/usr/lib/$(MACH64)/libposix4.so.1 \
-	/usr/lib/$(MACH64)/libproc.so \
-	/usr/lib/$(MACH64)/libproc.so.1 \
-	/usr/lib/$(MACH64)/libpthread.so \
-	/usr/lib/$(MACH64)/libpthread.so.1 \
-	/usr/lib/$(MACH64)/librcm.so \
-	/usr/lib/$(MACH64)/librcm.so.1 \
-	/usr/lib/$(MACH64)/libresolv.so \
-	/usr/lib/$(MACH64)/libresolv.so.2 \
-	/usr/lib/$(MACH64)/librestart.so \
-	/usr/lib/$(MACH64)/librestart.so.1 \
-	/usr/lib/$(MACH64)/librpcsvc.so \
-	/usr/lib/$(MACH64)/librpcsvc.so.1 \
-	/usr/lib/$(MACH64)/librt.so \
-	/usr/lib/$(MACH64)/librt.so.1 \
-	/usr/lib/$(MACH64)/librtld.so.1 \
-	/usr/lib/$(MACH64)/librtld_db.so \
-	/usr/lib/$(MACH64)/librtld_db.so.1 \
-	/usr/lib/$(MACH64)/libscf.so \
-	/usr/lib/$(MACH64)/libscf.so.1 \
-	/usr/lib/$(MACH64)/libsec.so \
-	/usr/lib/$(MACH64)/libsec.so.1 \
-	/usr/lib/$(MACH64)/libsecdb.so \
-	/usr/lib/$(MACH64)/libsecdb.so.1 \
-	/usr/lib/$(MACH64)/libsendfile.so \
-	/usr/lib/$(MACH64)/libsendfile.so.1 \
-	/usr/lib/$(MACH64)/libsocket.so \
-	/usr/lib/$(MACH64)/libsocket.so.1 \
-	/usr/lib/$(MACH64)/libsysevent.so \
-	/usr/lib/$(MACH64)/libsysevent.so.1 \
-	/usr/lib/$(MACH64)/libtermcap.so \
-	/usr/lib/$(MACH64)/libtermcap.so.1 \
-	/usr/lib/$(MACH64)/libtermlib.so \
-	/usr/lib/$(MACH64)/libtermlib.so.1 \
-	/usr/lib/$(MACH64)/libthread.so \
-	/usr/lib/$(MACH64)/libthread.so.1 \
-	/usr/lib/$(MACH64)/libthread_db.so \
-	/usr/lib/$(MACH64)/libthread_db.so.1 \
-	/usr/lib/$(MACH64)/libtsnet.so \
-	/usr/lib/$(MACH64)/libtsnet.so.1 \
-	/usr/lib/$(MACH64)/libtsol.so \
-	/usr/lib/$(MACH64)/libtsol.so.2 \
-	/usr/lib/$(MACH64)/libumem.so \
-	/usr/lib/$(MACH64)/libumem.so.1 \
-	/usr/lib/$(MACH64)/libuuid.so \
-	/usr/lib/$(MACH64)/libuuid.so.1 \
-	/usr/lib/$(MACH64)/libuutil.so \
-	/usr/lib/$(MACH64)/libuutil.so.1 \
-	/usr/lib/$(MACH64)/libw.so \
-	/usr/lib/$(MACH64)/libw.so.1 \
-	/usr/lib/$(MACH64)/libxnet.so \
-	/usr/lib/$(MACH64)/libxnet.so.1 \
-	/usr/lib/$(MACH64)/libzfs.so \
-	/usr/lib/$(MACH64)/libzfs.so.1 \
-	/usr/lib/$(MACH64)/libzfs_core.so \
-	/usr/lib/$(MACH64)/libzfs_core.so.1 \
-	/usr/lib/$(MACH64)/nss_compat.so.1 \
-	/usr/lib/$(MACH64)/nss_dns.so.1 \
-	/usr/lib/$(MACH64)/nss_files.so.1 \
-	/usr/lib/$(MACH64)/nss_nis.so.1 \
-	/usr/lib/$(MACH64)/nss_user.so.1 \
-	/usr/lib/fm/$(MACH64)/libfmevent.so \
-	/usr/lib/fm/$(MACH64)/libfmevent.so.1
-
-#
-# usr/src/Makefile uses INS.dir for any member of ROOTDIRS, the fact
-# these are symlinks to files has no bearing on this.
-#
-$(FILELINKS:%=$(ROOT)%):= \
-    INS.dir= -$(RM) $@; $(SYMLINK) $(REALPATH) $@
--- old/usr/src/cmd/sgs/Makefile.targ	2019-07-05 17:31:48.594181632 +0000
+++ new/usr/src/cmd/sgs/Makefile.targ	2019-07-05 17:31:48.611746255 +0000
@@ -39,18 +39,6 @@
 $(VAR_SGSBIN64)/%: %
 	$(INS.file)
 
-$(ROOTFS_LIBDIR)/$(LIBLINKS): $(ROOTFS_LIBDIR)/$(LIBLINKS)$(VERS)
-	$(INS.liblink)
-
-$(ROOTFS_LIBDIR64)/$(LIBLINKS): $(ROOTFS_LIBDIR64)/$(LIBLINKS)$(VERS)
-	$(INS.liblink64)
-
-$(ROOTFS_LIBDIR)/$(LIBLINKSCCC): $(ROOTFS_LIBDIR)/$(LIBLINKSCCC)$(VERS)
-	$(INS.liblinkccc)
-
-$(ROOTFS_LIBDIR64)/$(LIBLINKSCCC): $(ROOTFS_LIBDIR64)/$(LIBLINKSCCC)$(VERS)
-	$(INS.liblinkccc64)
-
 #
 # For those that install into the SGSPROTO directory.
 #
--- old/usr/src/cmd/sgs/Makefile.var	2019-07-05 17:31:49.077418491 +0000
+++ new/usr/src/cmd/sgs/Makefile.var	2019-07-05 17:31:49.095760113 +0000
@@ -132,11 +132,6 @@
 VAR_TOOLS_CPPFLAGS=		$(VAR_AVLINCDIR)
 
 #
-# liblddbg
-#
-VAR_LIBLDDBG_64_ROOTFS_LIBDIR=	$(ROOT)/lib/$(MACH64)
-
-#
 # rtld
 #
 VAR_RTLD_CPICLIB=	-L ../../../../lib/libc/$(MACH)
--- old/usr/src/cmd/sgs/lex/Makefile.com	2019-07-05 17:31:49.565733928 +0000
+++ new/usr/src/cmd/sgs/lex/Makefile.com	2019-07-05 17:31:49.582491283 +0000
@@ -44,6 +44,13 @@
 
 include		../../../../lib/Makefile.lib
 
+COMPATLINKS=	/usr/ccs/lib/libl.so \
+		/usr/ccs/lib/$(MACH64)/libl.so
+
+$(ROOT)/usr/ccs/lib/libl.so := COMPATLINKTARGET=../../lib/libl.so.1
+$(ROOT)/usr/ccs/lib/$(MACH64)/libl.so:= \
+	COMPATLINKTARGET=../../../lib/$(MACH64)/libl.so.1
+
 SRCDIR =	../common
 
 CSTD=	$(CSTD_GNU99)
--- old/usr/src/cmd/sgs/lex/Makefile.targ	2019-07-05 17:31:50.032491909 +0000
+++ new/usr/src/cmd/sgs/lex/Makefile.targ	2019-07-05 17:31:50.048639079 +0000
@@ -83,5 +83,8 @@
 $(DYNLINKLIBDIR)/%: %$(VERS)
 	$(INS.liblink)
 
+$(ROOTCOMPATLINKS):
+	$(RM) $@; $(SYMLINK) $(COMPATLINKTARGET) $@
+
 clean:
 	$(RM) $(POBJS) $(OBJS) $(PICS) $(CLEANFILES)
--- old/usr/src/cmd/sgs/lex/amd64/Makefile	2019-07-05 17:31:50.483207371 +0000
+++ new/usr/src/cmd/sgs/lex/amd64/Makefile	2019-07-05 17:31:50.500090073 +0000
@@ -23,8 +23,6 @@
 # Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
-#
 
 # This Makefile is only to produce 64-bit lex shared library libl.so.1
 # and not for building 64-bit lex itself.
@@ -36,7 +34,7 @@
 
 all_lib: $(LIBS)
 
-install_lib:        all_lib $(ROOTLIBS64) $(ROOTLINKS64)
+install_lib:        all_lib $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64)
 
 include		../Makefile.targ
 include		../../../Makefile.targ
--- old/usr/src/cmd/sgs/lex/i386/Makefile	2019-07-05 17:31:50.920117836 +0000
+++ new/usr/src/cmd/sgs/lex/i386/Makefile	2019-07-05 17:31:50.935686845 +0000
@@ -38,7 +38,7 @@
 
 install:	all $(ROOTPROG) $(ROOTFORMS) $(ROOTCCSBINLINK)
 
-install_lib:	all_lib $(ROOTLIBS) $(ROOTLINKS) $(DYNLINKLIB)
+install_lib:	all_lib $(ROOTLIBS) $(ROOTLINKS) $(DYNLINKLIB) $(ROOTCOMPATLINKS)
 
 include		../Makefile.targ
 include		../../../Makefile.targ
--- old/usr/src/cmd/sgs/lex/sparc/Makefile	2019-07-05 17:31:51.347301403 +0000
+++ new/usr/src/cmd/sgs/lex/sparc/Makefile	2019-07-05 17:31:51.362468544 +0000
@@ -38,7 +38,7 @@
 
 install:	all $(ROOTPROG) $(ROOTFORMS) $(ROOTCCSBINLINK)
 
-install_lib:	all_lib $(ROOTLIBS) $(ROOTLINKS) $(DYNLINKLIB)
+install_lib:	all_lib $(ROOTLIBS) $(ROOTLINKS) $(DYNLINKLIB) $(ROOTCOMPATLINKS)
 
 include		../Makefile.targ
 include		../../../Makefile.targ
--- old/usr/src/cmd/sgs/lex/sparcv9/Makefile	2019-07-05 17:31:51.771384659 +0000
+++ new/usr/src/cmd/sgs/lex/sparcv9/Makefile	2019-07-05 17:31:51.788504043 +0000
@@ -20,13 +20,9 @@
 # CDDL HEADER END
 #
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
-#
 # Copyright (c) 1997 by Sun Microsystems, Inc.
 # All rights reserved.
 #
-# cmd/sgs/lex/sparcv9/Makefile
-#
 
 # This Makefile is only to produce 64-bit lex shared library libl.so.1
 # and not for building 64-bit lex itself.
@@ -38,7 +34,7 @@
 
 all_lib: $(LIBS)
 
-install_lib:        all_lib $(ROOTLIBS64) $(ROOTLINKS64)
+install_lib:        all_lib $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64)
 
 include		../Makefile.targ
 include		../../../Makefile.targ
--- old/usr/src/cmd/sgs/libdl/Makefile.com	2019-07-05 17:31:52.238500990 +0000
+++ new/usr/src/cmd/sgs/libdl/Makefile.com	2019-07-05 17:31:52.255917736 +0000
@@ -27,3 +27,8 @@
 VERS =		.1
 
 include		$(SRC)/lib/Makefile.rootfs
+
+COMPATLINKS +=	/etc/lib/libdl.so.1
+$(ROOT)/etc/lib/libdl.so.1 := COMPATLINKTARGET=../../lib/libdl.so.1
+
+
--- old/usr/src/cmd/sgs/libdl/amd64/Makefile	2019-07-05 17:31:52.708685023 +0000
+++ new/usr/src/cmd/sgs/libdl/amd64/Makefile	2019-07-05 17:31:52.729220876 +0000
@@ -29,6 +29,7 @@
 
 DYNFLAGS +=	-F /usr/lib/$(MACH64)/ld.so.1
 
-install:	all $(ROOTLIBDIR64) .WAIT $(ROOTLIBS64) $(ROOTLINKS64)
+install:	all $(ROOTLIBDIR64) .WAIT $(ROOTLIBS64) $(ROOTLINKS64) \
+	$(ROOTCOMPATLINKS64)
 
 include		$(SRC)/lib/Makefile.filter.targ
--- old/usr/src/cmd/sgs/libdl/i386/Makefile	2019-07-05 17:31:53.187350221 +0000
+++ new/usr/src/cmd/sgs/libdl/i386/Makefile	2019-07-05 17:31:53.205346072 +0000
@@ -30,6 +30,6 @@
 
 DYNFLAGS +=	-F /usr/lib/ld.so.1
 
-install:	all $(ROOTLIBDIR) .WAIT $(ROOTLIBS) $(ROOTLINKS)
+install:	all $(ROOTLIBDIR) .WAIT $(ROOTLIBS) $(ROOTLINKS) $(ROOTCOMPATLINKS)
 
 include		$(SRC)/lib/Makefile.filter.targ
--- old/usr/src/cmd/sgs/libdl/sparc/Makefile	2019-07-05 17:31:53.665808064 +0000
+++ new/usr/src/cmd/sgs/libdl/sparc/Makefile	2019-07-05 17:31:53.684039733 +0000
@@ -39,7 +39,8 @@
 ROOT4LINKS =	$(ROOT4LIBDIR)/$(4DYNLIB)
 $(ROOT4LINKS):=	LIBLINKPATH = ../../lib/
 
-install:	all $(ROOTLIBDIR) .WAIT $(ROOTLIBS) $(ROOTLINKS) $(ROOT4LINKS)
+install:	all $(ROOTLIBDIR) .WAIT $(ROOTLIBS) $(ROOTLINKS) \
+	$(ROOT4LINKS) $(ROOTCOMPATLINKS64)
 
 $(ROOT4LINKS):	$(ROOTFS_DYNLIB)
 		$(INS.liblink)
--- old/usr/src/cmd/sgs/libdl/sparcv9/Makefile	2019-07-05 17:31:54.150071537 +0000
+++ new/usr/src/cmd/sgs/libdl/sparcv9/Makefile	2019-07-05 17:31:54.169364629 +0000
@@ -29,6 +29,7 @@
 
 DYNFLAGS +=	-F /usr/lib/$(MACH64)/ld.so.1
 
-install:	all $(ROOTLIBDIR64) .WAIT $(ROOTLIBS64) $(ROOTLINKS64)
+install:	all $(ROOTLIBDIR64) .WAIT $(ROOTLIBS64) $(ROOTLINKS64) \
+	$(ROOTCOMPATLINKS64)
 
 include		$(SRC)/lib/Makefile.filter.targ
--- old/usr/src/cmd/sgs/libelf/Makefile.com	2019-07-05 17:31:54.620931320 +0000
+++ new/usr/src/cmd/sgs/libelf/Makefile.com	2019-07-05 17:31:54.639840835 +0000
@@ -51,6 +51,7 @@
 OBJECTS=	$(BLTOBJS)  $(MACHOBJS)  $(COMOBJS)  $(CLASSOBJS) $(MISCOBJS)
 
 include $(SRC)/lib/Makefile.lib
+include $(SRC)/lib/Makefile.rootfs
 
 # Use the value of M4 set in Makefile.master via Makefile.lib
 
@@ -95,13 +96,6 @@
 LIBSRCS=	$(COMOBJS:%.o=../common/%.c)  $(MISCOBJS:%.o=../misc/%.c) \
 		$(MACHOBJS:%.o=%.c)  $(BLTSRCS)
 
-ROOTFS_DYNLIB=		$(DYNLIB:%=$(ROOTFS_LIBDIR)/%)
-
-ROOTFS_DYNLIB64=	$(DYNLIB:%=$(ROOTFS_LIBDIR64)/%)
-
-$(ROOTFS_DYNLIB) :=	FILEMODE= 755
-$(ROOTFS_DYNLIB64) :=	FILEMODE= 755
-
 LIBS =		$(DYNLIB)
 
 CLEANFILES +=	$(BLTSRCS) $(BLTFILES)
--- old/usr/src/cmd/sgs/libelf/Makefile.targ	2019-07-05 17:31:55.089996894 +0000
+++ new/usr/src/cmd/sgs/libelf/Makefile.targ	2019-07-05 17:31:55.109207683 +0000
@@ -46,8 +46,8 @@
 
 all:		$(BLTSRCS) .WAIT $(LIBS) $(LIBLINKS)
 
-install:	all .WAIT $(ROOTFS_LIBS) $(ROOTFS_LINKS) \
-		.WAIT $(ROOTDEMODIRS) .WAIT $(ROOTDEMOFILES)
+install:	all .WAIT $(ROOTLIBS) $(ROOTLINKS) \
+		.WAIT $(ROOTDEMODIRS) .WAIT $(ROOTDEMOFILES) $(ROOTCOMPATLINKS)
 
 delete:
 		$(RM) $(DYNLIB)
--- old/usr/src/cmd/sgs/libelf/Makefile.targ.64	2019-07-05 17:31:55.566811334 +0000
+++ new/usr/src/cmd/sgs/libelf/Makefile.targ.64	2019-07-05 17:31:55.584006752 +0000
@@ -45,7 +45,8 @@
 
 all:		$(BLTSRCS) .WAIT $(LIBS) $(LIBLINKS)
 
-install:	all .WAIT $(ROOTFS_LIBS64) $(ROOTFS_LINKS64)
+install:	all .WAIT $(ROOTFS_LIBS64) $(ROOTFS_LINKS64) \
+	$(ROOTCOMPATLINKS64)
 
 delete:
 		$(RM) $(DYNLIB)
--- old/usr/src/cmd/sgs/liblddbg/Makefile.com	2019-07-05 17:31:56.315621021 +0000
+++ new/usr/src/cmd/sgs/liblddbg/Makefile.com	2019-07-05 17:31:56.332089698 +0000
@@ -53,8 +53,14 @@
 
 
 include		$(SRC)/lib/Makefile.lib
+include		$(SRC)/lib/Makefile.rootfs
 include		$(SRC)/cmd/sgs/Makefile.com
 
+LIBS =		$(DYNLIB)
+
+COMPATLINKS =	/usr/lib/$(DYNLIB)
+COMPATLINKS64 = /usr/lib/$(MACH64)/$(DYNLIB)
+
 SRCDIR =	../common
 
 CERRWARN +=	-_gcc=-Wno-unused-value
@@ -87,4 +93,3 @@
 CLEANFILES +=	$(BLTFILES)
 CLOBBERFILES +=	$(DYNLIB) $(LIBLINKS)
 
-ROOTFS_DYNLIB =	$(DYNLIB:%=$(ROOTFS_LIBDIR)/%)
--- old/usr/src/cmd/sgs/liblddbg/amd64/Makefile	2019-07-05 17:31:56.751448445 +0000
+++ new/usr/src/cmd/sgs/liblddbg/amd64/Makefile	2019-07-05 17:31:56.767058707 +0000
@@ -26,11 +26,6 @@
 
 include		../Makefile.com
 
-ROOTFS_LIBDIR64 = \
-		$(VAR_LIBLDDBG_64_ROOTFS_LIBDIR)
-ROOTFS_DYNLIB64 = \
-		$(DYNLIB:%=$(ROOTFS_LIBDIR64)/%)
-
 CONVLIBDIR =	$(CONVLIBDIR64)
 
 .KEEP_STATE:
@@ -40,7 +35,7 @@
 all:		$(DYNLIB) $(LIBLINKS)
 
 install \
-package:	all $(ROOTFS_DYNLIB64)
+package:	all $(ROOTLIBS64) $(ROOTCOMPATLINKS64)
 
 include		../Makefile.targ
 include		../../Makefile.sub.64
--- old/usr/src/cmd/sgs/liblddbg/i386/Makefile	2019-07-05 17:31:57.211818281 +0000
+++ new/usr/src/cmd/sgs/liblddbg/i386/Makefile	2019-07-05 17:31:57.229877140 +0000
@@ -23,8 +23,6 @@
 # Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
-#
 
 include		../Makefile.com
 
@@ -33,6 +31,6 @@
 all:		$(DYNLIB) $(LIBLINKS)
 
 install \
-package:	all $(ROOTFS_DYNLIB)
+package:	all $(ROOTLIBS) $(ROOTCOMPATLINKS)
 
 include		../Makefile.targ
--- old/usr/src/cmd/sgs/liblddbg/sparc/Makefile	2019-07-05 17:31:57.705183051 +0000
+++ new/usr/src/cmd/sgs/liblddbg/sparc/Makefile	2019-07-05 17:31:57.724386580 +0000
@@ -23,8 +23,6 @@
 # Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
-#
 
 include		../Makefile.com
 
@@ -33,6 +31,6 @@
 all:		$(DYNLIB) $(LIBLINKS)
 
 install \
-package:	all $(ROOTFS_DYNLIB)
+package:	all $(ROOTLIBS)
 
 include		../Makefile.targ
--- old/usr/src/cmd/sgs/liblddbg/sparcv9/Makefile	2019-07-05 17:31:58.205672215 +0000
+++ new/usr/src/cmd/sgs/liblddbg/sparcv9/Makefile	2019-07-05 17:31:58.223791597 +0000
@@ -26,21 +26,14 @@
 
 include		../Makefile.com
 
-ROOTFS_LIBDIR64 = \
-		$(VAR_LIBLDDBG_64_ROOTFS_LIBDIR)
-ROOTFS_DYNLIB64 = \
-		$(DYNLIB:%=$(ROOTFS_LIBDIR64)/%)
-
 CONVLIBDIR =	$(CONVLIBDIR64)
 
 .KEEP_STATE:
 
-$(ROOTFS_DYNLIB64) :=	FILEMODE= 755
-
 all:		$(DYNLIB) $(LIBLINKS)
 
 install \
-package:	all $(ROOTFS_DYNLIB64)
+package:	all $(ROOTLIBS64) $(ROOTCOMPATLINKS64)
 
 include		../Makefile.targ
 include		../../Makefile.sub.64
--- old/usr/src/cmd/sgs/librtld/Makefile.com	2019-07-05 17:31:58.681602924 +0000
+++ new/usr/src/cmd/sgs/librtld/Makefile.com	2019-07-05 17:31:58.699473563 +0000
@@ -38,8 +38,14 @@
 
 
 include		$(SRC)/lib/Makefile.lib
+include		$(SRC)/lib/Makefile.rootfs
 include		$(SRC)/cmd/sgs/Makefile.com
 
+LIBS =		$(DYNLIB)
+
+COMPATLINKS =	/usr/lib/$(DYNLIB)
+COMPATLINKS64 = /usr/lib/$(MACH64)/$(DYNLIB)
+
 SRCDIR =	../common
 CPPFLAGS +=	-I../../rtld/common -I$(SRCBASE)/lib/libc/inc \
 		-I$(SRCBASE)/uts/common/krtld -I$(SRC)/common/sgsrtcid \
@@ -68,5 +74,3 @@
 
 CLEANFILES +=	$(BLTFILES)
 CLOBBERFILES +=	$(DYNLIB) $(LIBLINKS)
-
-ROOTFS_DYNLIB=	$(DYNLIB:%=$(ROOTFS_LIBDIR)/%)
--- old/usr/src/cmd/sgs/librtld/amd64/Makefile	2019-07-05 17:31:59.164431657 +0000
+++ new/usr/src/cmd/sgs/librtld/amd64/Makefile	2019-07-05 17:31:59.181216085 +0000
@@ -30,12 +30,9 @@
 
 .KEEP_STATE:
 
-ROOTFS_DYNLIB64 =	$(DYNLIB:%=$(ROOTFS_LIBDIR64)/%)
-$(ROOTFS_DYNLIB64) :=	FILEMODE=755
-
 all:		$(DYNLIB) $(LIBLINKS)
 
-install:	all $(ROOTFS_DYNLIB64)
+install:	all $(ROOTLIBS64) $(ROOTCOMPATLINKS64)
 
 CPPFLAGS +=	-D_ELF64
 
--- old/usr/src/cmd/sgs/librtld/i386/Makefile	2019-07-05 17:31:59.639225787 +0000
+++ new/usr/src/cmd/sgs/librtld/i386/Makefile	2019-07-05 17:31:59.657047452 +0000
@@ -32,6 +32,6 @@
 
 all:		$(DYNLIB) $(LIBLINKS)
 
-install:	all $(ROOTFS_DYNLIB)
+install:	all $(ROOTLIBS) $(ROOTCOMPATLINKS)
 
 include		$(SRC)/cmd/sgs/librtld/Makefile.targ
--- old/usr/src/cmd/sgs/librtld/sparc/Makefile	2019-07-05 17:32:00.127438498 +0000
+++ new/usr/src/cmd/sgs/librtld/sparc/Makefile	2019-07-05 17:32:00.146168971 +0000
@@ -32,6 +32,6 @@
 
 all:		$(DYNLIB) $(LIBLINKS)
 
-install:	all $(ROOTFS_DYNLIB)
+install:	all $(ROOTLIBS) $(ROOTCOMPATLINKS)
 
 include		$(SRC)/cmd/sgs/librtld/Makefile.targ
--- old/usr/src/cmd/sgs/librtld/sparcv9/Makefile	2019-07-05 17:32:00.604615802 +0000
+++ new/usr/src/cmd/sgs/librtld/sparcv9/Makefile	2019-07-05 17:32:00.622594047 +0000
@@ -30,12 +30,9 @@
 
 .KEEP_STATE:
 
-ROOTFS_DYNLIB64 =	$(DYNLIB:%=$(ROOTFS_LIBDIR64)/%)
-$(ROOTFS_DYNLIB64) :=	FILEMODE=755
-
 all:		$(DYNLIB) $(LIBLINKS)
 
-install:	all $(ROOTFS_DYNLIB64)
+install:	all $(ROOTLIBS64) $(ROOTCOMPATLINKS64)
 
 CPPFLAGS +=	-D_ELF64
 
--- old/usr/src/cmd/sgs/librtld_db/Makefile.com	2019-07-05 17:32:01.064556457 +0000
+++ new/usr/src/cmd/sgs/librtld_db/Makefile.com	2019-07-05 17:32:01.081609608 +0000
@@ -32,6 +32,7 @@
 OBJECTS =	$(BLTOBJ) $(COMOBJS) $(COMOBJS64) $(PLTOBJS)
 
 include		$(SRC)/lib/Makefile.lib
+include		$(SRC)/lib/Makefile.rootfs
 include		$(SRC)/cmd/sgs/Makefile.com
 
 SRCDIR =	../common
--- old/usr/src/cmd/sgs/librtld_db/amd64/Makefile	2019-07-05 17:32:01.509965542 +0000
+++ new/usr/src/cmd/sgs/librtld_db/amd64/Makefile	2019-07-05 17:32:01.526768530 +0000
@@ -39,7 +39,7 @@
 
 all:		$(DYNLIB)
 
-install:	all $(ROOTFS_DYNLIB64) $(ROOTFS_LINKS64)
+install:	all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64)
 
 pics/plt32_resolution.o: ../i386/plt32_resolution.c
 		$(COMPILE.c) -D_ELF32 $(PICFLAGS) -o $@ \
--- old/usr/src/cmd/sgs/librtld_db/i386/Makefile	2019-07-05 17:32:01.970664448 +0000
+++ new/usr/src/cmd/sgs/librtld_db/i386/Makefile	2019-07-05 17:32:01.991617209 +0000
@@ -37,6 +37,6 @@
 
 all:		$(DYNLIB)
 
-install:	all $(ROOTFS_DYNLIB) $(ROOTFS_LINKS)
+install:	all $(ROOTLIBS) $(ROOTLINKS) $(ROOTCOMPATLINKS)
 
 include		../Makefile.targ
--- old/usr/src/cmd/sgs/librtld_db/sparc/Makefile	2019-07-05 17:32:02.443169502 +0000
+++ new/usr/src/cmd/sgs/librtld_db/sparc/Makefile	2019-07-05 17:32:02.460258129 +0000
@@ -35,6 +35,6 @@
 
 all:		$(DYNLIB)
 
-install:	all $(ROOTFS_DYNLIB) $(ROOTFS_LINKS)
+install:	all $(ROOTLIBS) $(ROOTLINKS) $(ROOTCOMPATLINKS)
 
 include		../Makefile.targ
--- old/usr/src/cmd/sgs/librtld_db/sparcv9/Makefile	2019-07-05 17:32:02.897833778 +0000
+++ new/usr/src/cmd/sgs/librtld_db/sparcv9/Makefile	2019-07-05 17:32:02.913346938 +0000
@@ -39,7 +39,7 @@
 
 all:		$(DYNLIB)
 
-install:	all $(ROOTFS_DYNLIB64) $(ROOTFS_LINKS64)
+install:	all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64)
 
 pics/plt32_resolution.o: ../sparc/plt32_resolution.c
 		$(COMPILE.c) -D_ELF32 $(PICFLAGS) -o $@ \
--- old/usr/src/cmd/sgs/rtld/Makefile.com	2019-07-05 17:32:03.303789665 +0000
+++ new/usr/src/cmd/sgs/rtld/Makefile.com	2019-07-05 17:32:03.318693513 +0000
@@ -72,6 +72,13 @@
 ROOTDYNLIB=	$(RTLD:%=$(ROOTFS_LIBDIR)/%)
 ROOTDYNLIB64=	$(RTLD:%=$(ROOTFS_LIBDIR64)/%)
 
+COMPATLINKS=	/etc/lib/ld.so.1 /usr/lib/ld.so.1 /usr/lib/$(MACH64)/ld.so.1
+$(ROOT)/etc/lib/ld.so.1 := COMPATLINKTARGET= ../../lib/ld.so.1
+$(ROOT)/usr/lib/ld.so.1 := COMPATLINKTARGET= ../../lib/ld.so.1
+$(ROOT)/usr/lib/$(MACH64)/ld.so.1 := \
+	COMPATLINKTARGET= ../../../lib/$(MACH64)/ld.so.1
+
+install: $(ROOTCOMPATLINKS)
 
 FILEMODE =	755
 
--- old/usr/src/cmd/sgs/yacc/Makefile.com	2019-07-05 17:32:03.717337277 +0000
+++ new/usr/src/cmd/sgs/yacc/Makefile.com	2019-07-05 17:32:03.733938087 +0000
@@ -41,6 +41,13 @@
 
 include ../../../../lib/Makefile.lib
 
+COMPATLINKS=	/usr/ccs/lib/liby.so \
+		/usr/ccs/lib/$(MACH64)/liby.so
+
+$(ROOT)/usr/ccs/lib/liby.so := COMPATLINKTARGET=../../lib/liby.so.1
+$(ROOT)/usr/ccs/lib/$(MACH64)/liby.so:= \
+	COMPATLINKTARGET=../../../lib/$(MACH64)/liby.so.1
+
 SRCDIR =	../common
 
 # Override default source file derivation rule (in Makefile.lib)
--- old/usr/src/cmd/sgs/yacc/Makefile.targ	2019-07-05 17:32:04.208549736 +0000
+++ new/usr/src/cmd/sgs/yacc/Makefile.targ	2019-07-05 17:32:04.226493021 +0000
@@ -79,5 +79,8 @@
 $(DYNLINKLIBDIR)/%: %$(VERS)
 	$(INS.liblink)
 
+$(ROOTCOMPATLINKS):
+	$(RM) $@; $(SYMLINK) $(COMPATLINKTARGET) $@
+
 clean:
 		$(RM) $(POBJS) $(OBJS) $(PICS) $(CLEANFILES)
--- old/usr/src/cmd/sgs/yacc/amd64/Makefile	2019-07-05 17:32:04.659844682 +0000
+++ new/usr/src/cmd/sgs/yacc/amd64/Makefile	2019-07-05 17:32:04.677091578 +0000
@@ -23,8 +23,6 @@
 # Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
-#
 
 # This Makefile is only to produce 64-bit yacc shared library liby.so.1
 # and not for building 64-bit yacc itself.
@@ -39,7 +37,7 @@
 
 all_lib: $(LIBS)
 
-install_lib: all_lib $(ROOTLIBS64) $(ROOTLINKS64)
+install_lib: all_lib $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64)
 
 include ../Makefile.targ
 include ../../../Makefile.targ
--- old/usr/src/cmd/sgs/yacc/i386/Makefile	2019-07-05 17:32:05.134520217 +0000
+++ new/usr/src/cmd/sgs/yacc/i386/Makefile	2019-07-05 17:32:05.151114153 +0000
@@ -40,7 +40,7 @@
 		$(RM) $(ROOTCCSBIN)/yaccpar
 		$(SYMLINK) ../../share/lib/ccs/yaccpar $(ROOTCCSBIN)/yaccpar
 
-install_lib:	all_lib $(ROOTLIBS) $(ROOTLINKS) $(DYNLINKLIB)
+install_lib:	all_lib $(ROOTLIBS) $(ROOTLINKS) $(DYNLINKLIB) $(ROOTCOMPATLINKS)
 
 include		../Makefile.targ
 include		../../../Makefile.targ
--- old/usr/src/cmd/sgs/yacc/sparc/Makefile	2019-07-05 17:32:05.609796467 +0000
+++ new/usr/src/cmd/sgs/yacc/sparc/Makefile	2019-07-05 17:32:05.627172273 +0000
@@ -38,7 +38,7 @@
 
 install:	all $(ROOTPROG) $(ROOTYACCPAR) $(ROOTCCSBINLINK)
 
-install_lib:	all_lib $(ROOTLIBS) $(ROOTLINKS) $(DYNLINKLIB)
+install_lib:	all_lib $(ROOTLIBS) $(ROOTLINKS) $(DYNLINKLIB) $(ROOTCOMPATLINKS)
 		$(RM) $(ROOTCCSBIN)/yaccpar
 		$(SYMLINK) ../../share/lib/ccs/yaccpar $(ROOTCCSBIN)/yaccpar
 
--- old/usr/src/cmd/sgs/yacc/sparcv9/Makefile	2019-07-05 17:32:06.081247311 +0000
+++ new/usr/src/cmd/sgs/yacc/sparcv9/Makefile	2019-07-05 17:32:06.099827585 +0000
@@ -20,13 +20,9 @@
 # CDDL HEADER END
 #
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
-#
 # Copyright (c) 1997 by Sun Microsystems, Inc.
 # All rights reserved.
 #
-# cmd/sgs/yacc/sparcv9/Makefile
-#
 
 # This Makefile is only to produce 64-bit yacc shared library liby.so.1
 # and not for building 64-bit yacc itself.
@@ -41,7 +37,7 @@
 
 all_lib: $(LIBS)
 
-install_lib: all_lib $(ROOTLIBS64) $(ROOTLINKS64)
+install_lib: all_lib $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64)
 
 include ../Makefile.targ
 include ../../../Makefile.targ
--- old/usr/src/lib/Makefile.lib	2019-07-05 17:32:06.555197750 +0000
+++ new/usr/src/lib/Makefile.lib	2019-07-05 17:32:06.572728725 +0000
@@ -239,5 +239,15 @@
 TYPECHECK_LIB32 =		$(TYPECHECK_LIB:%=$(MACH)/%)
 TYPECHECK_LIB64 =		$(TYPECHECK_LIB:%=$(MACH64)/%)
 TYPECHECK_LIST=			$(TYPELIST:%=-T %)
-$(BUILD64)TYPECHECK.lib =	$(CTFDIFF) -t -I $(TYPECHECK_LIST) $(TYPECHECK_LIB32) $(TYPECHECK_LIB64)
+$(BUILD64)TYPECHECK.lib =	$(CTFDIFF) -t -I $(TYPECHECK_LIST) \
+	$(TYPECHECK_LIB32) $(TYPECHECK_LIB64)
 TYPECHECK =			$(TYPECHECK_LIB:%=%.typecheck)
+
+# Links we need to create for compatibility
+COMPATLINKS=
+COMPATLINKS64=
+ROOTCOMPATLINKS=$(COMPATLINKS:%=$(ROOT)/%)
+ROOTCOMPATLINKS64=$(COMPATLINKS64:%=$(ROOT)/%)
+
+# So if someone doesn't set the target-specific variable they get a clue
+COMPATLINKTARGET= /__you_didnt_use_COMPATLINKS_properly__
--- old/usr/src/lib/Makefile.mach	2019-07-05 17:32:07.054045149 +0000
+++ new/usr/src/lib/Makefile.mach	2019-07-05 17:32:07.076862453 +0000
@@ -23,10 +23,8 @@
 # Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
-#
-# lib/Makefile.mach
 #
+
 # included to define targets built with machine-dependent source
 #
 
@@ -56,4 +54,10 @@
 $(MACHLIBS64): FRC
 	@cd $(@D); pwd; VERSION='$(VERSION)' $(MAKE) $(@F)
 
+$(ROOTCOMPATLINKS):
+	$(RM) $@; $(SYMLINK) $(COMPATLINKTARGET) $@
+
+$(ROOTCOMPATLINKS64):
+	$(RM) $@; $(SYMLINK) $(COMPATLINKTARGET) $@
+
 FRC:
--- old/usr/src/lib/Makefile.rootfs	2019-07-05 17:32:07.551154476 +0000
+++ new/usr/src/lib/Makefile.rootfs	2019-07-05 17:32:07.567628422 +0000
@@ -22,11 +22,23 @@
 #
 # Copyright 2003 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
-#
-# ident	"%Z%%M%	%I%	%E% SMI"
-#
+
 # To install libraries in the root filesystem (/lib),
 # include this Makefile right after Makefile.lib
 
 ROOTLIBDIR=	$(ROOTFS_LIBDIR)
 ROOTLIBDIR64=	$(ROOTFS_LIBDIR64)
+
+
+COMPATLINKS=	/usr/lib/$(DYNLIB) \
+		/usr/lib/$(LIBLINKS)
+
+COMPATLINKS64=	/usr/lib/$(MACH64)/$(DYNLIB) \
+		/usr/lib/$(MACH64)/$(LIBLINKS)
+
+$(ROOT)/usr/lib/$(DYNLIB) := COMPATLINKTARGET=../../lib/$(DYNLIB)
+$(ROOT)/usr/lib/$(LIBLINKS) := COMPATLINKTARGET=../../lib/$(DYNLIB)
+$(ROOT)/usr/lib/$(MACH64)/$(DYNLIB):= \
+	COMPATLINKTARGET=../../../lib/$(MACH64)/$(DYNLIB)
+$(ROOT)/usr/lib/$(MACH64)/$(LIBLINKS) := \
+	COMPATLINKTARGET=../../../lib/$(MACH64)/$(DYNLIB)
--- old/usr/src/lib/Makefile.targ	2019-07-05 17:32:07.979295746 +0000
+++ new/usr/src/lib/Makefile.targ	2019-07-05 17:32:07.991721953 +0000
@@ -114,3 +114,10 @@
 clean:
 	-$(RM) $(OBJS)
 	-$(RM) $(PICS) $(DUPLICATE_SRC) $(LINTOUT) $(LINTLIB) $(CLEANFILES)
+
+$(ROOTCOMPATLINKS):
+	$(RM) $@; $(SYMLINK) $(COMPATLINKTARGET) $@
+
+$(ROOTCOMPATLINKS64):
+	$(RM) $@; $(SYMLINK) $(COMPATLINKTARGET) $@
+
--- old/usr/src/lib/crt/Makefile.com	2019-07-05 17:32:08.445056116 +0000
+++ new/usr/src/lib/crt/Makefile.com	2019-07-05 17:32:08.463418667 +0000
@@ -55,6 +55,38 @@
 $(COMMON_CRT) $(VALUES) := CFLAGS += $(C_PICFLAGS)
 $(COMMON_CRT) $(VALUES) := CFLAGS64 += $(C_PICFLAGS64)
 
+COMPATLINKS=	/usr/ccs/lib/values-Xa.o \
+		/usr/ccs/lib/values-Xc.o \
+		/usr/ccs/lib/values-Xs.o \
+		/usr/ccs/lib/values-Xt.o \
+		/usr/ccs/lib/values-xpg4.o \
+		/usr/ccs/lib/values-xpg6.o \
+		/usr/ccs/lib/$(MACH64)/values-Xa.o \
+		/usr/ccs/lib/$(MACH64)/values-Xc.o \
+		/usr/ccs/lib/$(MACH64)/values-Xs.o \
+		/usr/ccs/lib/$(MACH64)/values-Xt.o \
+		/usr/ccs/lib/$(MACH64)/values-xpg4.o \
+		/usr/ccs/lib/$(MACH64)/values-xpg6.o
+
+$(ROOT)/usr/ccs/lib/values-Xa.o:=	COMPATLINKTARGET=../../lib/values-Xa.o
+$(ROOT)/usr/ccs/lib/values-Xc.o:=	COMPATLINKTARGET=../../lib/values-Xc.o
+$(ROOT)/usr/ccs/lib/values-Xs.o:=	COMPATLINKTARGET=../../lib/values-Xs.o
+$(ROOT)/usr/ccs/lib/values-Xt.o:=	COMPATLINKTARGET=../../lib/values-Xt.o
+$(ROOT)/usr/ccs/lib/values-xpg4.o:=	COMPATLINKTARGET=../../lib/values-xpg4.o
+$(ROOT)/usr/ccs/lib/values-xpg6.o:=	COMPATLINKTARGET=../../lib/values-xpg6.o
+$(ROOT)/usr/ccs/lib/$(MACH64)/values-Xa.o:= \
+	COMPATLINKTARGET=../../../lib/$(MACH64)/values-Xa.o
+$(ROOT)/usr/ccs/lib/$(MACH64)/values-Xc.o:= \
+	COMPATLINKTARGET=../../../lib/$(MACH64)/values-Xc.o
+$(ROOT)/usr/ccs/lib/$(MACH64)/values-Xs.o:= \
+	COMPATLINKTARGET=../../../lib/$(MACH64)/values-Xs.o
+$(ROOT)/usr/ccs/lib/$(MACH64)/values-Xt.o:= \
+	COMPATLINKTARGET=../../../lib/$(MACH64)/values-Xt.o
+$(ROOT)/usr/ccs/lib/$(MACH64)/values-xpg4.o:= \
+	COMPATLINKTARGET=../../../lib/$(MACH64)/values-xpg4.o
+$(ROOT)/usr/ccs/lib/$(MACH64)/values-xpg6.o:= \
+	COMPATLINKTARGET=../../../lib/$(MACH64)/values-xpg6.o
+
 .KEEP_STATE:
 
 all:	$(OBJECTS)
@@ -95,4 +127,5 @@
 $(ROOTLIB64)/gcrt1.o:
 	$(RM) $(ROOTLIB64)/gcrt1.o; $(SYMLINK) crt1.o $(ROOTLIB64)/gcrt1.o
 
-FRC:
+$(ROOTCOMPATLINKS):
+	$(RM) $@; $(SYMLINK) $(COMPATLINKTARGET) $@
--- old/usr/src/lib/crt/amd64/Makefile	2019-07-05 17:32:08.929932056 +0000
+++ new/usr/src/lib/crt/amd64/Makefile	2019-07-05 17:32:08.947386451 +0000
@@ -27,4 +27,4 @@
 include ../Makefile.com
 include ../../Makefile.lib.64
 
-install:	$(ROOTOBJECTS64)
+install:	$(ROOTOBJECTS64) $(ROOTCOMPATLINKS64)
--- old/usr/src/lib/crt/i386/Makefile	2019-07-05 17:32:09.401385697 +0000
+++ new/usr/src/lib/crt/i386/Makefile	2019-07-05 17:32:09.419538755 +0000
@@ -26,4 +26,4 @@
 
 include ../Makefile.com
 
-install:	$(ROOTOBJECTS)
+install:	$(ROOTOBJECTS) $(ROOTCOMPATLINKS)
--- old/usr/src/lib/crt/sparc/Makefile	2019-07-05 17:32:09.873692068 +0000
+++ new/usr/src/lib/crt/sparc/Makefile	2019-07-05 17:32:09.891310660 +0000
@@ -26,4 +26,4 @@
 
 include ../Makefile.com
 
-install:	$(ROOTOBJECTS)
+install:	$(ROOTOBJECTS) $(ROOTCOMPATLINKS)
--- old/usr/src/lib/crt/sparcv9/Makefile	2019-07-05 17:32:10.352025696 +0000
+++ new/usr/src/lib/crt/sparcv9/Makefile	2019-07-05 17:32:10.370027503 +0000
@@ -27,4 +27,4 @@
 include ../Makefile.com
 include ../../Makefile.lib.64
 
-install:	$(ROOTOBJECTS64)
+install:	$(ROOTOBJECTS64) $(ROOTCOMPATLINKS64)
--- old/usr/src/lib/fm/libfmevent/Makefile.com	2019-07-05 17:32:10.835380952 +0000
+++ new/usr/src/lib/fm/libfmevent/Makefile.com	2019-07-05 17:32:10.853266912 +0000
@@ -81,6 +81,19 @@
 
 CLEANFILES += ../common/fmev_errstring.c
 
+COMPATLINKS =	/usr/lib/fm/$(DYNLIB) /usr/lib/fm/$(LIBLINKS)
+COMPATLINKS64 =	/usr/lib/fm/$(MACH64)/$(DYNLIB) \
+	/usr/lib/fm/$(MACH64)/$(LIBLINKS)
+
+$(ROOT)/usr/lib/fm/libfmevent.so.1 := \
+	COMPATLINKTARGET=../../../lib/fm/libfmevent.so.1
+$(ROOT)/usr/lib/fm/libfmevent.so := \
+	COMPATLINKTARGET=../../../lib/fm/libfmevent.so.1
+$(ROOT)/usr/lib/fm/$(MACH64)/libfmevent.so.1:= \
+	COMPATLINKTARGET=../../../../lib/fm/$(MACH64)/libfmevent.so.1
+$(ROOT)/usr/lib/fm/$(MACH64)/libfmevent.so:= \
+	COMPATLINKTARGET=../../../../lib/fm/$(MACH64)/libfmevent.so.1
+
 .KEEP_STATE:
 
 all: $(LIBS)
--- old/usr/src/lib/fm/libfmevent/amd64/Makefile	2019-07-05 17:32:11.312707490 +0000
+++ new/usr/src/lib/fm/libfmevent/amd64/Makefile	2019-07-05 17:32:11.331142513 +0000
@@ -27,4 +27,4 @@
 
 DYNFLAGS += -R/usr/lib/fm/$(MACH64)
 
-install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTLINT64)
+install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTLINT64) $(ROOTCOMPATLINKS64)
--- old/usr/src/lib/fm/libfmevent/i386/Makefile	2019-07-05 17:32:11.780650938 +0000
+++ new/usr/src/lib/fm/libfmevent/i386/Makefile	2019-07-05 17:32:11.797274059 +0000
@@ -26,4 +26,4 @@
 
 DYNFLAGS += -R/usr/lib/fm
 
-install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT)
+install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) $(ROOTCOMPATLINKS)
--- old/usr/src/lib/fm/libfmevent/sparc/Makefile	2019-07-05 17:32:12.262190167 +0000
+++ new/usr/src/lib/fm/libfmevent/sparc/Makefile	2019-07-05 17:32:12.280499949 +0000
@@ -26,4 +26,4 @@
 
 DYNFLAGS += -R/usr/lib/fm
 
-install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT)
+install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) $(ROOTCOMPATLINKS)
--- old/usr/src/lib/fm/libfmevent/sparcv9/Makefile	2019-07-05 17:32:12.731449025 +0000
+++ new/usr/src/lib/fm/libfmevent/sparcv9/Makefile	2019-07-05 17:32:12.751423204 +0000
@@ -27,4 +27,4 @@
 
 DYNFLAGS += -R/usr/lib/fm/$(MACH64)
 
-install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTLINT64)
+install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTLINT64) $(ROOTCOMPATLINKS64)
--- old/usr/src/lib/libadm/amd64/Makefile	2019-07-05 17:32:13.213278838 +0000
+++ new/usr/src/lib/libadm/amd64/Makefile	2019-07-05 17:32:13.230156203 +0000
@@ -23,10 +23,10 @@
 # Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
+
 #
 
 include ../Makefile.com
 include ../../Makefile.lib.64
 
-install: all $(ROOTLIBS64) $(ROOTLINKS64)
+install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64)
--- old/usr/src/lib/libadm/i386/Makefile	2019-07-05 17:32:13.662958723 +0000
+++ new/usr/src/lib/libadm/i386/Makefile	2019-07-05 17:32:13.679704168 +0000
@@ -23,11 +23,11 @@
 # Copyright 1997-2003 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
+
 #
 # lib/libadm/i386/Makefile
 #
 
 include ../Makefile.com
 
-install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT)
+install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) $(ROOTCOMPATLINKS)
--- old/usr/src/lib/libadm/sparc/Makefile	2019-07-05 17:32:14.150020063 +0000
+++ new/usr/src/lib/libadm/sparc/Makefile	2019-07-05 17:32:14.167106550 +0000
@@ -23,11 +23,11 @@
 # Copyright 1997-2003 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
+
 #
 # lib/libadm/sparc/Makefile
 #
 
 include ../Makefile.com
 
-install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT)
+install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) $(ROOTCOMPATLINKS)
--- old/usr/src/lib/libadm/sparcv9/Makefile	2019-07-05 17:32:14.605765944 +0000
+++ new/usr/src/lib/libadm/sparcv9/Makefile	2019-07-05 17:32:14.623836070 +0000
@@ -23,7 +23,7 @@
 # Copyright 1998-2003 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
+
 #
 # lib/libadm/sparcv9/Makefile
 #
@@ -31,4 +31,4 @@
 include ../Makefile.com
 include ../../Makefile.lib.64
 
-install: all $(ROOTLIBS64) $(ROOTLINKS64)
+install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64)
--- old/usr/src/lib/libaio/amd64/Makefile	2019-07-05 17:32:15.097697010 +0000
+++ new/usr/src/lib/libaio/amd64/Makefile	2019-07-05 17:32:15.115509971 +0000
@@ -27,6 +27,7 @@
 include		../Makefile.com
 include		$(SRC)/lib/Makefile.lib.64
 
-install:	all $(ROOTLIBDIR64) .WAIT $(ROOTLIBS64) $(ROOTLINKS64)
+install:	all $(ROOTLIBDIR64) .WAIT $(ROOTLIBS64) $(ROOTLINKS64) \
+	$(ROOTCOMPATLINKS64)
 
 include		$(SRC)/lib/Makefile.filter.targ
--- old/usr/src/lib/libaio/i386/Makefile	2019-07-05 17:32:15.561941081 +0000
+++ new/usr/src/lib/libaio/i386/Makefile	2019-07-05 17:32:15.579930376 +0000
@@ -26,6 +26,7 @@
 include		$(SRC)/lib/Makefile.filter.com
 include		../Makefile.com
 
-install:	all $(ROOTLIBDIR) .WAIT $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT)
+install:	all $(ROOTLIBDIR) .WAIT $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) \
+	$(ROOTCOMPATLINKS)
 
 include		$(SRC)/lib/Makefile.filter.targ
--- old/usr/src/lib/libaio/sparc/Makefile	2019-07-05 17:32:16.017797202 +0000
+++ new/usr/src/lib/libaio/sparc/Makefile	2019-07-05 17:32:16.034452388 +0000
@@ -26,6 +26,7 @@
 include		$(SRC)/lib/Makefile.filter.com
 include		../Makefile.com
 
-install:	all $(ROOTLIBDIR) .WAIT $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT)
+install:	all $(ROOTLIBDIR) .WAIT $(ROOTLIBS) $(ROOTLINKS) \
+	$(ROOTLINT) $(ROOTCOMPATLINKS)
 
 include		$(SRC)/lib/Makefile.filter.targ
--- old/usr/src/lib/libaio/sparcv9/Makefile	2019-07-05 17:32:16.476619848 +0000
+++ new/usr/src/lib/libaio/sparcv9/Makefile	2019-07-05 17:32:16.494193107 +0000
@@ -27,6 +27,7 @@
 include		../Makefile.com
 include		$(SRC)/lib/Makefile.lib.64
 
-install:	all $(ROOTLIBDIR64) .WAIT $(ROOTLIBS64) $(ROOTLINKS64)
+install:	all $(ROOTLIBDIR64) .WAIT $(ROOTLIBS64) $(ROOTLINKS64) \
+	$(ROOTCOMPATLINKS64)
 
 include		$(SRC)/lib/Makefile.filter.targ
--- old/usr/src/lib/libavl/Makefile.com	2019-07-05 17:32:16.911134946 +0000
+++ new/usr/src/lib/libavl/Makefile.com	2019-07-05 17:32:16.927021556 +0000
@@ -35,7 +35,7 @@
 
 $(LINTLIB) :=	SRCS = $(SRCDIR)/$(LINTSRC)
 
-COMDIR = 	$(SRC)/common/avl
+COMDIR =	$(SRC)/common/avl
 
 LDLIBS +=	-lc
 CFLAGS +=	$(CCVERBOSE)
@@ -44,6 +44,8 @@
 
 all : $(LIBS)
 
+install : $(ROOTCOMPATLINKS)
+
 lint : lintcheck
 
 pics/%.o:	 $(COMDIR)/%.c
--- old/usr/src/lib/libavl/amd64/Makefile	2019-07-05 17:32:17.391245633 +0000
+++ new/usr/src/lib/libavl/amd64/Makefile	2019-07-05 17:32:17.408302275 +0000
@@ -23,10 +23,10 @@
 # Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
+
 #
 
 include ../Makefile.com
 include ../../Makefile.lib.64
 
-install: all $(ROOTLIBS64) $(ROOTLINKS64)
+install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64)
--- old/usr/src/lib/libavl/i386/Makefile	2019-07-05 17:32:17.901882364 +0000
+++ new/usr/src/lib/libavl/i386/Makefile	2019-07-05 17:32:17.919407809 +0000
@@ -23,10 +23,10 @@
 # Copyright 2003 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
+
 #
 # lib/libavl/i386/Makefile
 
 include ../Makefile.com
 
-install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT)
+install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) $(ROOTCOMPATLINKS)
--- old/usr/src/lib/libavl/sparc/Makefile	2019-07-05 17:32:18.387197908 +0000
+++ new/usr/src/lib/libavl/sparc/Makefile	2019-07-05 17:32:18.404903176 +0000
@@ -23,10 +23,10 @@
 # Copyright 2003 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
+
 #
 # lib/libavl/sparc/Makefile
 
 include ../Makefile.com
 
-install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT)
+install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) $(ROOTCOMPATLINKS)
--- old/usr/src/lib/libavl/sparcv9/Makefile	2019-07-05 17:32:18.858723572 +0000
+++ new/usr/src/lib/libavl/sparcv9/Makefile	2019-07-05 17:32:18.875415354 +0000
@@ -23,11 +23,11 @@
 # Copyright 2003 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
+
 #
 # lib/libavl/sparcv9/Makefile
 
 include ../Makefile.com
 include ../../Makefile.lib.64
 
-install: all $(ROOTLIBS64) $(ROOTLINKS64)
+install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64)
--- old/usr/src/lib/libbsm/amd64/Makefile	2019-07-05 17:32:19.316409301 +0000
+++ new/usr/src/lib/libbsm/amd64/Makefile	2019-07-05 17:32:19.332340677 +0000
@@ -22,10 +22,10 @@
 # Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
+
 #
 
 include ../Makefile.com
 include ../../Makefile.lib.64
 
-install: all $(ROOTLIBS64) $(ROOTLINKS64)
+install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64)
--- old/usr/src/lib/libbsm/i386/Makefile	2019-07-05 17:32:19.788642259 +0000
+++ new/usr/src/lib/libbsm/i386/Makefile	2019-07-05 17:32:19.805787455 +0000
@@ -22,9 +22,9 @@
 # Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
+
 #
 
 include ../Makefile.com
 
-install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT)
+install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) $(ROOTCOMPATLINKS)
--- old/usr/src/lib/libbsm/sparc/Makefile	2019-07-05 17:32:20.261405440 +0000
+++ new/usr/src/lib/libbsm/sparc/Makefile	2019-07-05 17:32:20.278711975 +0000
@@ -22,9 +22,9 @@
 # Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
+
 #
 
 include ../Makefile.com
 
-install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT)
+install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) $(ROOTCOMPATLINKS)
--- old/usr/src/lib/libbsm/sparcv9/Makefile	2019-07-05 17:32:20.727963486 +0000
+++ new/usr/src/lib/libbsm/sparcv9/Makefile	2019-07-05 17:32:20.745743827 +0000
@@ -22,10 +22,10 @@
 # Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
+
 #
 
 include ../Makefile.com
 include ../../Makefile.lib.64
 
-install: all $(ROOTLIBS64) $(ROOTLINKS64)
+install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64)
--- old/usr/src/lib/libc/Makefile	2019-07-05 17:32:21.203298594 +0000
+++ new/usr/src/lib/libc/Makefile	2019-07-05 17:32:21.220128167 +0000
@@ -45,6 +45,7 @@
 
 # include common library definitions
 include ../Makefile.lib
+include ../Makefile.rootfs
 
 #
 # on some architectures, we build multiple libc variants
@@ -92,7 +93,7 @@
 
 LIBS =		$(DYNLIB)
 
-ROOTLIBS64=	$(ROOTLIBDIR64)/$(DYNLIB)
+ROOTLIBS64=	$(ROOTLIB64)/$(DYNLIB)
 MACHLIBS64=	$(MACH64)/$(DYNLIB)
 VARIANTLIBS=	$(VARIANTS:%=$(MACH)_%/$(VARBLD)/$(LIBBASENAME)_%.so.1)
 VARIANTLIBS64=	$(VARIANTS64:%=$(MACH)_%/$(VARBLD64)/$(LIBBASENAME)_%.so.1)
@@ -110,8 +111,8 @@
 $(ROOTHDRDIR)/%: port/gen/%
 	$(INS.file)
 
-$(ROOTLIBDIR)/$(DYNLIB)	:=	FILEMODE = 755
-$(ROOTLIBDIR64)/$(DYNLIB) :=	FILEMODE = 755
+$(ROOTLIB)/$(DYNLIB)	:=	FILEMODE = 755
+$(ROOTLIB64)/$(DYNLIB) :=	FILEMODE = 755
 $(ROOTFS_LIBDIR)/$(DYNLIB)	:=	FILEMODE = 755
 $(ROOTFS_LIBDIR64)/$(DYNLIB)	:=	FILEMODE = 755
 
@@ -165,7 +166,9 @@
 install:	all			\
 		etc			\
 		inslib32		\
-		$(BUILD64) inslib64
+		$(ROOTCOMPATLINKS)
+
+$(BUILD64)install: inslib64 $(ROOTCOMPATLINKS64)
 
 inslib32:	$(ROOTFS_LIBS) $(ROOTFS_LINKS) $(ROOTVARIANTLIBS)
 
@@ -177,15 +180,6 @@
 
 check:	$(CHECKHDRS)
 
-$(ROOTFS_LIB)/%: $(MACH)/%
-	$(INS.file)
-$(ROOTFS_LIBDIR)/$(LIBLINKS): $(ROOTFS_LIBDIR)/$(LIBLINKS)$(VERS)
-	$(INS.liblink)
-$(ROOTFS_LIB64)/%: $(MACH64)/%
-	$(INS.file)
-$(ROOTFS_LIBDIR64)/$(LIBLINKS): $(ROOTFS_LIBDIR64)/$(LIBLINKS)$(VERS)
-	$(INS.liblink)
-
 $(ROOTVARIANTDIR): $(ROOTLIB)
 	$(INS.dir)
 $(ROOTVARIANTDIR)/%: $(ROOTVARIANTDIR) $(VAR1_BLDDIR)/%
@@ -235,5 +229,6 @@
 	$(XREF) -x $@
 
 FRC:
+
 # include MACH-specific library targets
 include ../Makefile.mach
--- old/usr/src/lib/libc_db/amd64/Makefile	2019-07-05 17:32:21.685154229 +0000
+++ new/usr/src/lib/libc_db/amd64/Makefile	2019-07-05 17:32:21.705166850 +0000
@@ -33,4 +33,5 @@
 
 BUILD.SO= $(LD) -o $@ -G $(DYNFLAGS) $(PICS) $(LDLIBS)
 
-install: all $(ROOTLIBDIR64) .WAIT $(ROOTLIBS64) $(ROOTLINKS64)
+install: all $(ROOTLIBDIR64) .WAIT $(ROOTLIBS64) $(ROOTLINKS64) \
+	$(ROOTCOMPATLINKS64)
--- old/usr/src/lib/libc_db/i386/Makefile	2019-07-05 17:32:22.199710927 +0000
+++ new/usr/src/lib/libc_db/i386/Makefile	2019-07-05 17:32:22.216375819 +0000
@@ -30,4 +30,5 @@
 
 BUILD.SO= $(LD) -o $@ -G $(DYNFLAGS) $(PICS) $(LDLIBS)
 
-install: all $(ROOTLIBDIR) .WAIT $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT)
+install: all $(ROOTLIBDIR) .WAIT $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) \
+	$(ROOTCOMPATLINKS)
--- old/usr/src/lib/libc_db/sparc/Makefile	2019-07-05 17:32:22.676054904 +0000
+++ new/usr/src/lib/libc_db/sparc/Makefile	2019-07-05 17:32:22.695753523 +0000
@@ -30,4 +30,5 @@
 
 BUILD.SO= $(LD) -o $@ -G $(DYNFLAGS) $(PICS) $(LDLIBS)
 
-install: all $(ROOTLIBDIR) .WAIT $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT)
+install: all $(ROOTLIBDIR) .WAIT $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) \
+	$(ROOTCOMPATLINKS)
--- old/usr/src/lib/libc_db/sparcv9/Makefile	2019-07-05 17:32:23.176028850 +0000
+++ new/usr/src/lib/libc_db/sparcv9/Makefile	2019-07-05 17:32:23.193949353 +0000
@@ -33,4 +33,5 @@
 
 BUILD.SO= $(LD) -o $@ -G $(DYNFLAGS) $(PICS) $(LDLIBS)
 
-install: all $(ROOTLIBDIR64) .WAIT $(ROOTLIBS64) $(ROOTLINKS64)
+install: all $(ROOTLIBDIR64) .WAIT $(ROOTLIBS64) $(ROOTLINKS64) \
+	$(ROOTCOMPATLINKS64)
--- old/usr/src/lib/libcmdutils/amd64/Makefile	2019-07-05 17:32:23.661835257 +0000
+++ new/usr/src/lib/libcmdutils/amd64/Makefile	2019-07-05 17:32:23.679555205 +0000
@@ -23,10 +23,10 @@
 # Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
+
 #
 
 include ../Makefile.com
 include ../../Makefile.lib.64
 
-install: all $(ROOTLIBS64) $(ROOTLINKS64)
+install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64)
--- old/usr/src/lib/libcmdutils/i386/Makefile	2019-07-05 17:32:24.183155585 +0000
+++ new/usr/src/lib/libcmdutils/i386/Makefile	2019-07-05 17:32:24.203848568 +0000
@@ -23,10 +23,10 @@
 # Copyright 2003 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
+
 #
 # lib/libcmdutils/i386/Makefile
 
 include ../Makefile.com
 
-install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT)
+install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) $(ROOTCOMPATLINKS)
--- old/usr/src/lib/libcmdutils/sparc/Makefile	2019-07-05 17:32:24.690027710 +0000
+++ new/usr/src/lib/libcmdutils/sparc/Makefile	2019-07-05 17:32:24.707052038 +0000
@@ -23,10 +23,10 @@
 # Copyright 2003 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
+
 #
 # lib/libcmdutils/sparc/Makefile
 
 include ../Makefile.com
 
-install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT)
+install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) $(ROOTCOMPATLINKS)
--- old/usr/src/lib/libcmdutils/sparcv9/Makefile	2019-07-05 17:32:25.166644766 +0000
+++ new/usr/src/lib/libcmdutils/sparcv9/Makefile	2019-07-05 17:32:25.183315808 +0000
@@ -23,11 +23,11 @@
 # Copyright 2003 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
+
 #
 # lib/libcmdutils/sparcv9/Makefile
 
 include ../Makefile.com
 include ../../Makefile.lib.64
 
-install: all $(ROOTLIBS64) $(ROOTLINKS64)
+install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64)
--- old/usr/src/lib/libcontract/amd64/Makefile	2019-07-05 17:32:25.654748186 +0000
+++ new/usr/src/lib/libcontract/amd64/Makefile	2019-07-05 17:32:25.672526816 +0000
@@ -23,10 +23,9 @@
 # Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
-#
 
 include ../Makefile.com
 include ../../Makefile.lib.64
 
-install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTLINT64)
+install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTLINT64) \
+	$(ROOTCOMPATLINKS64)
--- old/usr/src/lib/libcontract/i386/Makefile	2019-07-05 17:32:26.157943750 +0000
+++ new/usr/src/lib/libcontract/i386/Makefile	2019-07-05 17:32:26.177144790 +0000
@@ -23,9 +23,7 @@
 # Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
-#
 
 include ../Makefile.com
 
-install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT)
+install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) $(ROOTCOMPATLINKS)
--- old/usr/src/lib/libcontract/sparc/Makefile	2019-07-05 17:32:26.619802990 +0000
+++ new/usr/src/lib/libcontract/sparc/Makefile	2019-07-05 17:32:26.636812913 +0000
@@ -23,9 +23,7 @@
 # Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
-#
 
 include ../Makefile.com
 
-install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT)
+install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) $(ROOTCOMPATLINKS)
--- old/usr/src/lib/libcontract/sparcv9/Makefile	2019-07-05 17:32:27.102775030 +0000
+++ new/usr/src/lib/libcontract/sparcv9/Makefile	2019-07-05 17:32:27.121353741 +0000
@@ -23,10 +23,8 @@
 # Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
-#
 
 include ../Makefile.com
 include ../../Makefile.lib.64
 
-install: all $(ROOTLIBS64) $(ROOTLINKS64)
+install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64)
--- old/usr/src/lib/libctf/amd64/Makefile	2019-07-05 17:32:27.547982337 +0000
+++ new/usr/src/lib/libctf/amd64/Makefile	2019-07-05 17:32:27.563685443 +0000
@@ -22,10 +22,8 @@
 # Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
-#
 
 include ../Makefile.com
 include ../../Makefile.lib.64
 
-install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTLINT64)
+install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTLINT64) $(ROOTCOMPATLINKS64)
--- old/usr/src/lib/libctf/i386/Makefile	2019-07-05 17:32:28.016471442 +0000
+++ new/usr/src/lib/libctf/i386/Makefile	2019-07-05 17:32:28.033413072 +0000
@@ -22,9 +22,7 @@
 # Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
-#
 
 include ../Makefile.com
 
-install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT)
+install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) $(ROOTCOMPATLINKS)
--- old/usr/src/lib/libctf/sparc/Makefile	2019-07-05 17:32:28.471762253 +0000
+++ new/usr/src/lib/libctf/sparc/Makefile	2019-07-05 17:32:28.489600109 +0000
@@ -22,9 +22,7 @@
 # Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
-#
 
 include ../Makefile.com
 
-install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT)
+install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) $(ROOTCOMPATLINKS)
--- old/usr/src/lib/libctf/sparcv9/Makefile	2019-07-05 17:32:28.920636913 +0000
+++ new/usr/src/lib/libctf/sparcv9/Makefile	2019-07-05 17:32:28.938253764 +0000
@@ -22,10 +22,8 @@
 # Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
-#
 
 include ../Makefile.com
 include ../../Makefile.lib.64
 
-install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTLINT64)
+install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTLINT64) $(ROOTCOMPATLINKS64)
--- old/usr/src/lib/libcurses/Makefile.com	2019-07-05 17:32:29.345153283 +0000
+++ new/usr/src/lib/libcurses/Makefile.com	2019-07-05 17:32:29.361312889 +0000
@@ -207,6 +207,30 @@
 		$(RM) llib-ltermlib.ln ; \
 		$(SYMLINK) ./llib-lcurses.ln llib-ltermlib.ln;
 
+COMPATLINKS +=	/usr/ccs/lib/libcurses.so \
+		/usr/ccs/lib/libtermlib.so \
+		/usr/lib/libtermlib.so \
+		/usr/lib/libtermlib.so.1
+
+COMPATLINKS64 +=	/usr/ccs/lib/$(MACH64)/libcurses.so \
+			/usr/ccs/lib/$(MACH64)/libtermlib.so \
+			/usr/lib/$(MACH64)/libtermlib.so \
+			/usr/lib/$(MACH64)/libtermlib.so.1
+
+$(ROOT)/usr/ccs/lib/libcurses.so := COMPATLINKTARGET=../../../lib/libcurses.so.1
+$(ROOT)/usr/ccs/lib/libtermlib.so := \
+	COMPATLINKTARGET=../../../lib/libcurses.so.1
+$(ROOT)/usr/ccs/lib/$(MACH64)/libcurses.so := \
+	COMPATLINKTARGET=../../../../lib/$(MACH64)/libcurses.so.1
+$(ROOT)/usr/ccs/lib/$(MACH64)/libtermlib.so := \
+	COMPATLINKTARGET=../../../../lib/$(MACH64)/libcurses.so.1
+$(ROOT)/usr/lib/libtermlib.so.1 := COMPATLINKTARGET= ../../lib/libcurses.so.1
+$(ROOT)/usr/lib/libtermlib.so := COMPATLINKTARGET= ../../lib/libcurses.so.1
+$(ROOT)/usr/lib/$(MACH64)/libtermlib.so.1 := \
+	COMPATLINKTARGET= ../../../lib/$(MACH64)/libcurses.so.1
+$(ROOT)/usr/lib/$(MACH64)/libtermlib.so := \
+	COMPATLINKTARGET= ../../../lib/$(MACH64)/libcurses.so.1
+
 #
 # Install rule for the lint source, which is installed only in
 # the default library dir, not MACH64 etc.
--- old/usr/src/lib/libcurses/amd64/Makefile	2019-07-05 17:32:29.777432693 +0000
+++ new/usr/src/lib/libcurses/amd64/Makefile	2019-07-05 17:32:29.791062182 +0000
@@ -31,4 +31,4 @@
 
 all: $(LIBS)
 
-install: all $(ROOTLIBS64) $(ROOTLINKS64)
+install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64)
--- old/usr/src/lib/libcurses/i386/Makefile	2019-07-05 17:32:30.252073491 +0000
+++ new/usr/src/lib/libcurses/i386/Makefile	2019-07-05 17:32:30.269325706 +0000
@@ -22,8 +22,6 @@
 # Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
-#
 
 include ../Makefile.com
 
@@ -31,4 +29,4 @@
 
 all: $(LIBS)
 
-install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT)
+install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) $(ROOTCOMPATLINKS)
--- old/usr/src/lib/libcurses/sparc/Makefile	2019-07-05 17:32:30.706111112 +0000
+++ new/usr/src/lib/libcurses/sparc/Makefile	2019-07-05 17:32:30.722437369 +0000
@@ -22,7 +22,7 @@
 # Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
+
 #
 
 include ../Makefile.com
@@ -31,4 +31,4 @@
 
 all: $(LIBS)
 
-install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT)
+install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) $(ROOTCOMPATLINKS)
--- old/usr/src/lib/libcurses/sparcv9/Makefile	2019-07-05 17:32:31.182751322 +0000
+++ new/usr/src/lib/libcurses/sparcv9/Makefile	2019-07-05 17:32:31.198942890 +0000
@@ -31,4 +31,4 @@
 
 all: $(LIBS)
 
-install: all $(ROOTLIBS64) $(ROOTLINKS64)
+install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64)
--- old/usr/src/lib/libdevice/amd64/Makefile	2019-07-05 17:32:31.660841176 +0000
+++ new/usr/src/lib/libdevice/amd64/Makefile	2019-07-05 17:32:31.678312288 +0000
@@ -23,10 +23,10 @@
 # Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
+
 #
 
 include ../Makefile.com
 include ../../Makefile.lib.64
 
-install: all $(ROOTLIBS64) $(ROOTLINKS64)
+install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64)
--- old/usr/src/lib/libdevice/i386/Makefile	2019-07-05 17:32:32.171936688 +0000
+++ new/usr/src/lib/libdevice/i386/Makefile	2019-07-05 17:32:32.191006682 +0000
@@ -23,9 +23,9 @@
 # Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
+
 #
 
 include ../Makefile.com
 
-install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT)
+install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) $(ROOTCOMPATLINKS)
--- old/usr/src/lib/libdevice/sparc/Makefile	2019-07-05 17:32:32.655528473 +0000
+++ new/usr/src/lib/libdevice/sparc/Makefile	2019-07-05 17:32:32.672671640 +0000
@@ -23,9 +23,9 @@
 # Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
+
 #
 
 include ../Makefile.com
 
-install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT)
+install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) $(ROOTCOMPATLINKS)
--- old/usr/src/lib/libdevice/sparcv9/Makefile	2019-07-05 17:32:33.113943275 +0000
+++ new/usr/src/lib/libdevice/sparcv9/Makefile	2019-07-05 17:32:33.131643911 +0000
@@ -23,10 +23,10 @@
 # Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
+
 #
 
 include ../Makefile.com
 include ../../Makefile.lib.64
 
-install: all $(ROOTLIBS64) $(ROOTLINKS64)
+install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64)
--- old/usr/src/lib/libdevid/amd64/Makefile	2019-07-05 17:32:33.590734683 +0000
+++ new/usr/src/lib/libdevid/amd64/Makefile	2019-07-05 17:32:33.607898795 +0000
@@ -23,10 +23,10 @@
 # Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
+
 #
 
 include ../Makefile.com
 include ../../Makefile.lib.64
 
-install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTLINT64)
+install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTLINT64) $(ROOTCOMPATLINKS64)
--- old/usr/src/lib/libdevid/i386/Makefile	2019-07-05 17:32:34.078247427 +0000
+++ new/usr/src/lib/libdevid/i386/Makefile	2019-07-05 17:32:34.098685156 +0000
@@ -23,9 +23,9 @@
 # Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
+
 #
 
 include ../Makefile.com
 
-install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT)
+install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) $(ROOTCOMPATLINKS)
--- old/usr/src/lib/libdevid/sparc/Makefile	2019-07-05 17:32:34.569168089 +0000
+++ new/usr/src/lib/libdevid/sparc/Makefile	2019-07-05 17:32:34.585402259 +0000
@@ -23,9 +23,9 @@
 # Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
+
 #
 
 include ../Makefile.com
 
-install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT)
+install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) $(ROOTCOMPATLINKS)
--- old/usr/src/lib/libdevid/sparcv9/Makefile	2019-07-05 17:32:35.008566883 +0000
+++ new/usr/src/lib/libdevid/sparcv9/Makefile	2019-07-05 17:32:35.028070137 +0000
@@ -23,10 +23,10 @@
 # Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
+
 #
 
 include ../Makefile.com
 include ../../Makefile.lib.64
 
-install: all $(ROOTLIBS64) $(ROOTLINKS64)
+install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64)
--- old/usr/src/lib/libdevinfo/amd64/Makefile	2019-07-05 17:32:35.473718238 +0000
+++ new/usr/src/lib/libdevinfo/amd64/Makefile	2019-07-05 17:32:35.491916553 +0000
@@ -22,7 +22,7 @@
 # Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
+
 #
 
 include ../Makefile.com
@@ -30,4 +30,4 @@
 
 all: $(LIBS)
 
-install: all $(ROOTLIBS64) $(ROOTLINKS64)
+install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64)
--- old/usr/src/lib/libdevinfo/i386/Makefile	2019-07-05 17:32:35.946600902 +0000
+++ new/usr/src/lib/libdevinfo/i386/Makefile	2019-07-05 17:32:35.964440427 +0000
@@ -22,11 +22,11 @@
 # Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
+
 #
 
 include ../Makefile.com
 
 all: $(LIBS)
 
-install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT)
+install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) $(ROOTCOMPATLINKS)
--- old/usr/src/lib/libdevinfo/sparc/Makefile	2019-07-05 17:32:36.437440751 +0000
+++ new/usr/src/lib/libdevinfo/sparc/Makefile	2019-07-05 17:32:36.454489011 +0000
@@ -22,11 +22,11 @@
 # Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
+
 #
 
 include ../Makefile.com
 
 all: $(LIBS)
 
-install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT)
+install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) $(ROOTCOMPATLINKS)
--- old/usr/src/lib/libdevinfo/sparcv9/Makefile	2019-07-05 17:32:36.891473489 +0000
+++ new/usr/src/lib/libdevinfo/sparcv9/Makefile	2019-07-05 17:32:36.908084469 +0000
@@ -22,7 +22,7 @@
 # Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
+
 #
 
 include ../Makefile.com
@@ -30,4 +30,4 @@
 
 all: $(LIBS)
 
-install: all $(ROOTLIBS64) $(ROOTLINKS64)
+install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64)
--- old/usr/src/lib/libdhcpagent/i386/Makefile	2019-07-05 17:32:37.342963399 +0000
+++ new/usr/src/lib/libdhcpagent/i386/Makefile	2019-07-05 17:32:37.358392209 +0000
@@ -23,9 +23,9 @@
 # Copyright (c) 1999-2001 by Sun Microsystems, Inc.
 # All rights reserved.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
+
 #
 
 include ../Makefile.com
 
-install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT)
+install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) $(ROOTCOMPATLINKS)
--- old/usr/src/lib/libdhcpagent/sparc/Makefile	2019-07-05 17:32:37.791163631 +0000
+++ new/usr/src/lib/libdhcpagent/sparc/Makefile	2019-07-05 17:32:37.811631459 +0000
@@ -23,9 +23,9 @@
 # Copyright (c) 1999-2001 by Sun Microsystems, Inc.
 # All rights reserved.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
+
 #
 
 include ../Makefile.com
 
-install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT)
+install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) $(ROOTCOMPATLINKS)
--- old/usr/src/lib/libdhcputil/amd64/Makefile	2019-07-05 17:32:38.267590888 +0000
+++ new/usr/src/lib/libdhcputil/amd64/Makefile	2019-07-05 17:32:38.285158576 +0000
@@ -26,4 +26,4 @@
 include ../Makefile.com
 include ../../Makefile.lib.64
 
-install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTLINT64)
+install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTLINT64) $(ROOTCOMPATLINKS64)
--- old/usr/src/lib/libdhcputil/i386/Makefile	2019-07-05 17:32:38.738644254 +0000
+++ new/usr/src/lib/libdhcputil/i386/Makefile	2019-07-05 17:32:38.756012422 +0000
@@ -23,10 +23,10 @@
 # Copyright (c) 1999-2001 by Sun Microsystems, Inc.
 # All rights reserved.
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
+
 #
 # lib/libdhcputil/i386/Makefile
 
 include ../Makefile.com
 
-install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT)
+install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) $(ROOTCOMPATLINKS)
--- old/usr/src/lib/libdhcputil/sparc/Makefile	2019-07-05 17:32:39.228544351 +0000
+++ new/usr/src/lib/libdhcputil/sparc/Makefile	2019-07-05 17:32:39.245626855 +0000
@@ -23,10 +23,10 @@
 # Copyright (c) 1999-2001 by Sun Microsystems, Inc.
 # All rights reserved.
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
+
 #
 # lib/libdhcputil/sparc/Makefile
 
 include ../Makefile.com
 
-install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT)
+install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) $(ROOTCOMPATLINKS)
--- old/usr/src/lib/libdhcputil/sparcv9/Makefile	2019-07-05 17:32:39.696919016 +0000
+++ new/usr/src/lib/libdhcputil/sparcv9/Makefile	2019-07-05 17:32:39.714349182 +0000
@@ -26,4 +26,4 @@
 include ../Makefile.com
 include ../../Makefile.lib.64
 
-install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTLINT64)
+install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTLINT64) $(ROOTCOMPATLINKS64)
--- old/usr/src/lib/libdlpi/amd64/Makefile	2019-07-05 17:32:40.179815722 +0000
+++ new/usr/src/lib/libdlpi/amd64/Makefile	2019-07-05 17:32:40.197941449 +0000
@@ -22,10 +22,10 @@
 # Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
+
 #
 
 include ../Makefile.com
 include ../../Makefile.lib.64
 
-install: all $(ROOTLIBS64) $(ROOTLINKS64)
+install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64)
--- old/usr/src/lib/libdlpi/i386/Makefile	2019-07-05 17:32:40.660644031 +0000
+++ new/usr/src/lib/libdlpi/i386/Makefile	2019-07-05 17:32:40.679840541 +0000
@@ -23,9 +23,9 @@
 # Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
+
 #
 
 include ../Makefile.com
 
-install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT)
+install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) $(ROOTCOMPATLINKS)
--- old/usr/src/lib/libdlpi/sparc/Makefile	2019-07-05 17:32:41.153343722 +0000
+++ new/usr/src/lib/libdlpi/sparc/Makefile	2019-07-05 17:32:41.171197075 +0000
@@ -23,9 +23,9 @@
 # Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
+
 #
 
 include ../Makefile.com
 
-install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT)
+install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) $(ROOTCOMPATLINKS)
--- old/usr/src/lib/libdlpi/sparcv9/Makefile	2019-07-05 17:32:41.614981279 +0000
+++ new/usr/src/lib/libdlpi/sparcv9/Makefile	2019-07-05 17:32:41.632654347 +0000
@@ -22,10 +22,10 @@
 # Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
+
 #
 
 include ../Makefile.com
 include ../../Makefile.lib.64
 
-install: all $(ROOTLIBS64) $(ROOTLINKS64)
+install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64)
--- old/usr/src/lib/libdoor/amd64/Makefile	2019-07-05 17:32:42.109295012 +0000
+++ new/usr/src/lib/libdoor/amd64/Makefile	2019-07-05 17:32:42.128588252 +0000
@@ -27,6 +27,7 @@
 include		../Makefile.com
 include		$(SRC)/lib/Makefile.lib.64
 
-install:	all $(ROOTLIBDIR64) .WAIT $(ROOTLIBS64) $(ROOTLINKS64)
+install:	all $(ROOTLIBDIR64) .WAIT $(ROOTLIBS64) $(ROOTLINKS64) \
+	$(ROOTCOMPATLINKS64)
 
 include		$(SRC)/lib/Makefile.filter.targ
--- old/usr/src/lib/libdoor/i386/Makefile	2019-07-05 17:32:42.597292004 +0000
+++ new/usr/src/lib/libdoor/i386/Makefile	2019-07-05 17:32:42.615059506 +0000
@@ -26,6 +26,7 @@
 include		$(SRC)/lib/Makefile.filter.com
 include		../Makefile.com
 
-install:	all $(ROOTLIBDIR) .WAIT $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT)
+install:	all $(ROOTLIBDIR) .WAIT $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) \
+	$(ROOTCOMPATLINKS)
 
 include		$(SRC)/lib/Makefile.filter.targ
--- old/usr/src/lib/libdoor/sparc/Makefile	2019-07-05 17:32:43.081559363 +0000
+++ new/usr/src/lib/libdoor/sparc/Makefile	2019-07-05 17:32:43.099688296 +0000
@@ -26,6 +26,7 @@
 include		$(SRC)/lib/Makefile.filter.com
 include		../Makefile.com
 
-install:	all $(ROOTLIBDIR) .WAIT $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT)
+install:	all $(ROOTLIBDIR) .WAIT $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) \
+	$(ROOTCOMPATLINKS)
 
 include		$(SRC)/lib/Makefile.filter.targ
--- old/usr/src/lib/libdoor/sparcv9/Makefile	2019-07-05 17:32:43.555334360 +0000
+++ new/usr/src/lib/libdoor/sparcv9/Makefile	2019-07-05 17:32:43.573533316 +0000
@@ -27,6 +27,7 @@
 include		../Makefile.com
 include		$(SRC)/lib/Makefile.lib.64
 
-install:	all $(ROOTLIBDIR64) .WAIT $(ROOTLIBS64) $(ROOTLINKS64)
+install:	all $(ROOTLIBDIR64) .WAIT $(ROOTLIBS64) $(ROOTLINKS64) \
+	$(ROOTCOMPATLINKS64)
 
 include		$(SRC)/lib/Makefile.filter.targ
--- old/usr/src/lib/libdscp/sparc/Makefile	2019-07-05 17:32:44.061707802 +0000
+++ new/usr/src/lib/libdscp/sparc/Makefile	2019-07-05 17:32:44.080504844 +0000
@@ -22,11 +22,11 @@
 # Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
+
 #
 
 include	../Makefile.com
 
 all: $(LIBS)
 
-install: all $(ROOTLIBS) $(ROOTLINKS)
+install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTCOMPATLINKS)
--- old/usr/src/lib/libdwarf/amd64/Makefile	2019-07-05 17:32:44.565591705 +0000
+++ new/usr/src/lib/libdwarf/amd64/Makefile	2019-07-05 17:32:44.583107001 +0000
@@ -16,4 +16,4 @@
 include ../Makefile.com
 include ../../Makefile.lib.64
 
-install: all $(ROOTLIBS64) $(ROOTLINKS64)
+install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64)
--- old/usr/src/lib/libdwarf/i386/Makefile	2019-07-05 17:32:45.052201076 +0000
+++ new/usr/src/lib/libdwarf/i386/Makefile	2019-07-05 17:32:45.068929377 +0000
@@ -15,4 +15,4 @@
 
 include ../Makefile.com
 
-install: all $(ROOTLIBS) $(ROOTLINKS)
+install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTCOMPATLINKS)
--- old/usr/src/lib/libdwarf/sparc/Makefile	2019-07-05 17:32:45.530500215 +0000
+++ new/usr/src/lib/libdwarf/sparc/Makefile	2019-07-05 17:32:45.553906691 +0000
@@ -15,4 +15,4 @@
 
 include ../Makefile.com
 
-install: all $(ROOTLIBS) $(ROOTLINKS)
+install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTCOMPATLINKS)
--- old/usr/src/lib/libdwarf/sparcv9/Makefile	2019-07-05 17:32:45.993341288 +0000
+++ new/usr/src/lib/libdwarf/sparcv9/Makefile	2019-07-05 17:32:46.008527308 +0000
@@ -16,4 +16,4 @@
 include ../Makefile.com
 include ../../Makefile.lib.64
 
-install: all $(ROOTLIBS64) $(ROOTLINKS64)
+install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64)
--- old/usr/src/lib/libefi/amd64/Makefile	2019-07-05 17:32:46.439573672 +0000
+++ new/usr/src/lib/libefi/amd64/Makefile	2019-07-05 17:32:46.455104771 +0000
@@ -23,7 +23,7 @@
 # Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
+
 #
 
 include ../Makefile.com
@@ -33,4 +33,4 @@
 
 all: $(LIBS)
 
-install: all $(ROOTLIBS64) $(ROOTLINKS64)
+install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64)
--- old/usr/src/lib/libefi/i386/Makefile	2019-07-05 17:32:46.826896635 +0000
+++ new/usr/src/lib/libefi/i386/Makefile	2019-07-05 17:32:46.846321035 +0000
@@ -23,9 +23,9 @@
 # Copyright 2002 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
+
 #
 
 include ../Makefile.com
 
-install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT)
+install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) $(ROOTCOMPATLINKS)
--- old/usr/src/lib/libefi/sparc/Makefile	2019-07-05 17:32:47.296903708 +0000
+++ new/usr/src/lib/libefi/sparc/Makefile	2019-07-05 17:32:47.308242335 +0000
@@ -23,9 +23,9 @@
 # Copyright 2002 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
+
 #
 
 include ../Makefile.com
 
-install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT)
+install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) $(ROOTCOMPATLINKS)
--- old/usr/src/lib/libefi/sparcv9/Makefile	2019-07-05 17:32:47.695108531 +0000
+++ new/usr/src/lib/libefi/sparcv9/Makefile	2019-07-05 17:32:47.711796602 +0000
@@ -23,7 +23,7 @@
 # Copyright 2002-2003 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
+
 #
 
 include ../Makefile.com
@@ -33,4 +33,4 @@
 
 all: $(LIBS)
 
-install: all $(ROOTLIBS64) $(ROOTLINKS64)
+install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64)
--- old/usr/src/lib/libeti/form/Makefile.com	2019-07-05 17:32:48.199740080 +0000
+++ new/usr/src/lib/libeti/form/Makefile.com	2019-07-05 17:32:48.216899814 +0000
@@ -79,6 +79,13 @@
 CERRWARN +=	-_gcc=-Wno-uninitialized
 CERRWARN +=	-_gcc=-Wno-char-subscripts
 
+COMPATLINKS=	/usr/ccs/lib/libform.so \
+		/usr/ccs/lib/$(MACH64)/libform.so
+
+$(ROOT)/usr/ccs/lib/libform.so := COMPATLINKTARGET= ../../lib/libform.so.1
+$(ROOT)/usr/ccs/lib/$(MACH64)/libform.so := \
+	COMPATLINKTARGET= ../../../lib/$(MACH64)/libform.so.1
+
 .KEEP_STATE:
 
 all: $(LIBS)
--- old/usr/src/lib/libeti/form/amd64/Makefile	2019-07-05 17:32:48.634468464 +0000
+++ new/usr/src/lib/libeti/form/amd64/Makefile	2019-07-05 17:32:48.650462485 +0000
@@ -29,4 +29,4 @@
 
 .KEEP_STATE:
 
-install: all $(ROOTLIBS64) $(ROOTLINKS64)
+install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64)
--- old/usr/src/lib/libeti/form/i386/Makefile	2019-07-05 17:32:49.094473902 +0000
+++ new/usr/src/lib/libeti/form/i386/Makefile	2019-07-05 17:32:49.110731088 +0000
@@ -26,4 +26,5 @@
 
 .KEEP_STATE:
 
-install: all $(ROOTLIBS) $(ROOTLINKS) $(DYNLINKLIB) $(ROOTLINT)
+install: all $(ROOTLIBS) $(ROOTLINKS) $(DYNLINKLIB) $(ROOTLINT) \
+	$(ROOTCOMPATLINKS)
--- old/usr/src/lib/libeti/form/sparc/Makefile	2019-07-05 17:32:49.532643652 +0000
+++ new/usr/src/lib/libeti/form/sparc/Makefile	2019-07-05 17:32:49.548187392 +0000
@@ -26,4 +26,5 @@
 
 .KEEP_STATE:
 
-install: all $(ROOTLIBS) $(ROOTLINKS) $(DYNLINKLIB) $(ROOTLINT)
+install: all $(ROOTLIBS) $(ROOTLINKS) $(DYNLINKLIB) $(ROOTLINT) \
+	$(ROOTCOMPATLINKS)
--- old/usr/src/lib/libeti/form/sparcv9/Makefile	2019-07-05 17:32:49.997995521 +0000
+++ new/usr/src/lib/libeti/form/sparcv9/Makefile	2019-07-05 17:32:50.016344901 +0000
@@ -29,4 +29,4 @@
 
 .KEEP_STATE:
 
-install: all $(ROOTLIBS64) $(ROOTLINKS64)
+install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64)
--- old/usr/src/lib/libeti/menu/Makefile.com	2019-07-05 17:32:50.479358629 +0000
+++ new/usr/src/lib/libeti/menu/Makefile.com	2019-07-05 17:32:50.496375067 +0000
@@ -75,6 +75,13 @@
 
 CERRWARN +=	-_gcc=-Wno-parentheses
 
+COMPATLINKS=	/usr/ccs/lib/libmenu.so \
+		/usr/ccs/lib/$(MACH64)/libmenu.so
+
+$(ROOT)/usr/ccs/lib/libmenu.so := COMPATLINKTARGET= ../../lib/libmenu.so.1
+$(ROOT)/usr/ccs/lib/$(MACH64)/libmenu.so:= \
+	COMPATLINKTARGET=../../../lib/$(MACH64)/libmenu.so.1
+
 .KEEP_STATE:
 
 all: $(LIBS)
--- old/usr/src/lib/libeti/menu/amd64/Makefile	2019-07-05 17:32:50.956680969 +0000
+++ new/usr/src/lib/libeti/menu/amd64/Makefile	2019-07-05 17:32:50.974278520 +0000
@@ -22,7 +22,7 @@
 # Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
+
 #
 
 include ../Makefile.com
@@ -32,4 +32,4 @@
 
 .KEEP_STATE:
 
-install: all $(ROOTLIBS64) $(ROOTLINKS64)
+install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64)
--- old/usr/src/lib/libeti/menu/i386/Makefile	2019-07-05 17:32:51.427401071 +0000
+++ new/usr/src/lib/libeti/menu/i386/Makefile	2019-07-05 17:32:51.444997200 +0000
@@ -22,11 +22,12 @@
 # Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
+
 #
 
 include ../Makefile.com
 
 .KEEP_STATE:
 
-install: all $(ROOTLIBS) $(ROOTLINKS) $(DYNLINKLIB) $(ROOTLINT)
+install: all $(ROOTLIBS) $(ROOTLINKS) $(DYNLINKLIB) $(ROOTLINT) \
+	$(ROOTCOMPATLINKS)
--- old/usr/src/lib/libeti/menu/sparc/Makefile	2019-07-05 17:32:51.912478497 +0000
+++ new/usr/src/lib/libeti/menu/sparc/Makefile	2019-07-05 17:32:51.930345483 +0000
@@ -22,11 +22,12 @@
 # Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
+
 #
 
 include ../Makefile.com
 
 .KEEP_STATE:
 
-install: all $(ROOTLIBS) $(ROOTLINKS) $(DYNLINKLIB) $(ROOTLINT)
+install: all $(ROOTLIBS) $(ROOTLINKS) $(DYNLINKLIB) $(ROOTLINT) \
+	$(ROOTCOMPATLINKS)
--- old/usr/src/lib/libeti/menu/sparcv9/Makefile	2019-07-05 17:32:52.396165262 +0000
+++ new/usr/src/lib/libeti/menu/sparcv9/Makefile	2019-07-05 17:32:52.412489929 +0000
@@ -22,7 +22,7 @@
 # Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
+
 #
 
 include ../Makefile.com
@@ -32,4 +32,4 @@
 
 .KEEP_STATE:
 
-install: all $(ROOTLIBS64) $(ROOTLINKS64)
+install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64)
--- old/usr/src/lib/libeti/panel/Makefile.com	2019-07-05 17:32:52.865448080 +0000
+++ new/usr/src/lib/libeti/panel/Makefile.com	2019-07-05 17:32:52.883511238 +0000
@@ -51,6 +51,14 @@
 
 CERRWARN +=	-_gcc=-Wno-parentheses
 
+COMPATLINKS=	/usr/ccs/lib/libpanel.so \
+		/usr/ccs/lib/$(MACH64)/libpanel.so
+
+$(ROOT)/usr/ccs/lib/libpanel.so:=	COMPATLINKTARGET=../../lib/libpanel.so.1
+$(ROOT)/usr/ccs/lib/$(MACH64)/libpanel.so:= \
+	COMPATLINKTARGET=../../../lib/$(MACH64)/libpanel.so.1
+
+
 .KEEP_STATE:
 
 all: $(LIBS)
--- old/usr/src/lib/libeti/panel/amd64/Makefile	2019-07-05 17:32:53.332790157 +0000
+++ new/usr/src/lib/libeti/panel/amd64/Makefile	2019-07-05 17:32:53.349643568 +0000
@@ -22,7 +22,7 @@
 # Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
+
 #
 
 include ../Makefile.com
@@ -32,4 +32,4 @@
 
 .KEEP_STATE:
 
-install: all $(ROOTLIBS64) $(ROOTLINKS64)
+install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64)
--- old/usr/src/lib/libeti/panel/i386/Makefile	2019-07-05 17:32:53.818261637 +0000
+++ new/usr/src/lib/libeti/panel/i386/Makefile	2019-07-05 17:32:53.836653970 +0000
@@ -22,11 +22,12 @@
 # Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
+
 #
 
 include ../Makefile.com
 
 .KEEP_STATE:
 
-install: all $(ROOTLIBS) $(ROOTLINKS) $(DYNLINKLIB) $(ROOTLINT)
+install: all $(ROOTLIBS) $(ROOTLINKS) $(DYNLINKLIB) $(ROOTLINT) \
+	$(ROOTCOMPATLINKS)
--- old/usr/src/lib/libeti/panel/sparc/Makefile	2019-07-05 17:32:54.350969813 +0000
+++ new/usr/src/lib/libeti/panel/sparc/Makefile	2019-07-05 17:32:54.369654924 +0000
@@ -22,11 +22,12 @@
 # Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
+
 #
 
 include ../Makefile.com
 
 .KEEP_STATE:
 
-install: all $(ROOTLIBS) $(ROOTLINKS) $(DYNLINKLIB) $(ROOTLINT)
+install: all $(ROOTLIBS) $(ROOTLINKS) $(DYNLINKLIB) $(ROOTLINT) \
+	$(ROOTCOMPATLINKS)
--- old/usr/src/lib/libeti/panel/sparcv9/Makefile	2019-07-05 17:32:54.822158886 +0000
+++ new/usr/src/lib/libeti/panel/sparcv9/Makefile	2019-07-05 17:32:54.839596765 +0000
@@ -22,7 +22,7 @@
 # Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
+
 #
 
 include ../Makefile.com
@@ -32,4 +32,4 @@
 
 .KEEP_STATE:
 
-install: all $(ROOTLIBS64) $(ROOTLINKS64)
+install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64)
--- old/usr/src/lib/libfakekernel/amd64/Makefile	2019-07-05 17:32:55.269781128 +0000
+++ new/usr/src/lib/libfakekernel/amd64/Makefile	2019-07-05 17:32:55.280166892 +0000
@@ -29,4 +29,4 @@
 include ../Makefile.com
 include ../../Makefile.lib.64
 
-install: all $(ROOTLIBS64) $(ROOTLINKS64)
+install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64)
--- old/usr/src/lib/libfakekernel/i386/Makefile	2019-07-05 17:32:55.712324048 +0000
+++ new/usr/src/lib/libfakekernel/i386/Makefile	2019-07-05 17:32:55.728446836 +0000
@@ -28,4 +28,4 @@
 
 include ../Makefile.com
 
-install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT)
+install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) $(ROOTCOMPATLINKS)
--- old/usr/src/lib/libfakekernel/sparc/Makefile	2019-07-05 17:32:56.148349914 +0000
+++ new/usr/src/lib/libfakekernel/sparc/Makefile	2019-07-05 17:32:56.164518434 +0000
@@ -28,4 +28,4 @@
 
 include ../Makefile.com
 
-install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT)
+install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) $(ROOTCOMPATLINKS)
--- old/usr/src/lib/libfakekernel/sparcv9/Makefile	2019-07-05 17:32:56.575945170 +0000
+++ new/usr/src/lib/libfakekernel/sparcv9/Makefile	2019-07-05 17:32:56.591356345 +0000
@@ -29,4 +29,4 @@
 include ../Makefile.com
 include ../../Makefile.lib.64
 
-install: all $(ROOTLIBS64) $(ROOTLINKS64)
+install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64)
--- old/usr/src/lib/libfdisk/amd64/Makefile	2019-07-05 17:32:57.035108829 +0000
+++ new/usr/src/lib/libfdisk/amd64/Makefile	2019-07-05 17:32:57.056704759 +0000
@@ -26,4 +26,4 @@
 include ../Makefile.com
 include ../../Makefile.lib.64
 
-install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTLINT64)
+install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTLINT64) $(ROOTCOMPATLINKS64)
--- old/usr/src/lib/libfdisk/i386/Makefile	2019-07-05 17:32:57.532496046 +0000
+++ new/usr/src/lib/libfdisk/i386/Makefile	2019-07-05 17:32:57.549411430 +0000
@@ -26,4 +26,4 @@
 
 include ../Makefile.com
 
-install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT)
+install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) $(ROOTCOMPATLINKS)
--- old/usr/src/lib/libfdisk/sparcv9/Makefile	2019-07-05 17:32:58.011732805 +0000
+++ new/usr/src/lib/libfdisk/sparcv9/Makefile	2019-07-05 17:32:58.030146749 +0000
@@ -25,4 +25,4 @@
 include ../Makefile.com
 include ../../Makefile.lib.64
 
-install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTLINT64)
+install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTLINT64) $(ROOTCOMPATLINKS64)
--- old/usr/src/lib/libgen/Makefile.com	2019-07-05 17:32:58.463588237 +0000
+++ new/usr/src/lib/libgen/Makefile.com	2019-07-05 17:32:58.481768829 +0000
@@ -50,6 +50,13 @@
 # not linted
 SMATCH=off
 
+COMPATLINKS +=	/usr/ccs/lib/libgen.so \
+		/usr/ccs/lib/$(MACH64)/libgen.so \
+
+$(ROOT)/usr/ccs/lib/libgen.so := COMPATLINKTARGET=../../../lib/libgen.so.1
+$(ROOT)/usr/ccs/lib/$(MACH64)/libgen.so:= \
+	COMPATLINKTARGET=../../../../lib/$(MACH64)/libgen.so.1
+
 .KEEP_STATE:
 
 all: $(LIBS)
--- old/usr/src/lib/libgen/amd64/Makefile	2019-07-05 17:32:58.933292060 +0000
+++ new/usr/src/lib/libgen/amd64/Makefile	2019-07-05 17:32:58.950345970 +0000
@@ -29,4 +29,4 @@
 
 all: $(LIBS)
 
-install: all $(ROOTLIBS64) $(ROOTLINKS64)
+install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64)
--- old/usr/src/lib/libgen/i386/Makefile	2019-07-05 17:32:59.392292080 +0000
+++ new/usr/src/lib/libgen/i386/Makefile	2019-07-05 17:32:59.409300572 +0000
@@ -26,4 +26,4 @@
 
 all: $(LIBS)
 
-install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT)
+install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) $(ROOTCOMPATLINKS)
--- old/usr/src/lib/libgen/sparc/Makefile	2019-07-05 17:32:59.862911728 +0000
+++ new/usr/src/lib/libgen/sparc/Makefile	2019-07-05 17:32:59.881182001 +0000
@@ -26,4 +26,4 @@
 
 all: $(LIBS)
 
-install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT)
+install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) $(ROOTCOMPATLINKS)
--- old/usr/src/lib/libgen/sparcv9/Makefile	2019-07-05 17:33:00.361857251 +0000
+++ new/usr/src/lib/libgen/sparcv9/Makefile	2019-07-05 17:33:00.379246782 +0000
@@ -29,4 +29,4 @@
 
 all: $(LIBS)
 
-install: all $(ROOTLIBS64) $(ROOTLINKS64)
+install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64)
--- old/usr/src/lib/libinetutil/amd64/Makefile	2019-07-05 17:33:00.841072294 +0000
+++ new/usr/src/lib/libinetutil/amd64/Makefile	2019-07-05 17:33:00.859119255 +0000
@@ -23,10 +23,10 @@
 # Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
+
 #
 
 include ../Makefile.com
 include ../../Makefile.lib.64
 
-install: all $(ROOTLIBS64) $(ROOTLINKS64)
+install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64)
--- old/usr/src/lib/libinetutil/i386/Makefile	2019-07-05 17:33:01.305453381 +0000
+++ new/usr/src/lib/libinetutil/i386/Makefile	2019-07-05 17:33:01.323001160 +0000
@@ -23,8 +23,8 @@
 # Copyright (c) 2001 by Sun Microsystems, Inc.
 # All rights reserved.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
+
 #
 include ../Makefile.com
 
-install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT)
+install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) $(ROOTCOMPATLINKS)
--- old/usr/src/lib/libinetutil/sparc/Makefile	2019-07-05 17:33:01.774355747 +0000
+++ new/usr/src/lib/libinetutil/sparc/Makefile	2019-07-05 17:33:01.790707844 +0000
@@ -23,9 +23,9 @@
 # Copyright (c) 2001 by Sun Microsystems, Inc.
 # All rights reserved.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
+
 #
 
 include ../Makefile.com
 
-install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT)
+install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) $(ROOTCOMPATLINKS)
--- old/usr/src/lib/libinetutil/sparcv9/Makefile	2019-07-05 17:33:02.227277250 +0000
+++ new/usr/src/lib/libinetutil/sparcv9/Makefile	2019-07-05 17:33:02.236589897 +0000
@@ -23,10 +23,10 @@
 # Copyright (c) 2001 by Sun Microsystems, Inc.
 # All rights reserved.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
+
 #
 
 include ../Makefile.com
 include ../../Makefile.lib.64
 
-install: all $(ROOTLIBS64) $(ROOTLINKS64)
+install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64)
--- old/usr/src/lib/libintl/amd64/Makefile	2019-07-05 17:33:02.650960514 +0000
+++ new/usr/src/lib/libintl/amd64/Makefile	2019-07-05 17:33:02.666853977 +0000
@@ -27,6 +27,7 @@
 include		../Makefile.com
 include		$(SRC)/lib/Makefile.lib.64
 
-install:	all $(ROOTLIBDIR64) .WAIT $(ROOTLIBS64) $(ROOTLINKS64)
+install:	all $(ROOTLIBDIR64) .WAIT $(ROOTLIBS64) $(ROOTLINKS64) \
+	$(ROOTCOMPATLINKS64)
 
 include		$(SRC)/lib/Makefile.filter.targ
--- old/usr/src/lib/libintl/i386/Makefile	2019-07-05 17:33:03.080803563 +0000
+++ new/usr/src/lib/libintl/i386/Makefile	2019-07-05 17:33:03.096172357 +0000
@@ -26,6 +26,7 @@
 include		$(SRC)/lib/Makefile.filter.com
 include		../Makefile.com
 
-install:	all $(ROOTLIBDIR) .WAIT $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT)
+install:	all $(ROOTLIBDIR) .WAIT $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) \
+	$(ROOTCOMPATLINKS)
 
 include		$(SRC)/lib/Makefile.filter.targ
--- old/usr/src/lib/libintl/sparc/Makefile	2019-07-05 17:33:03.477025183 +0000
+++ new/usr/src/lib/libintl/sparc/Makefile	2019-07-05 17:33:03.491876915 +0000
@@ -26,6 +26,7 @@
 include		$(SRC)/lib/Makefile.filter.com
 include		../Makefile.com
 
-install:	all $(ROOTLIBDIR) .WAIT $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT)
+install:	all $(ROOTLIBDIR) .WAIT $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) \
+	$(ROOTCOMPATLINKS)
 
 include		$(SRC)/lib/Makefile.filter.targ
--- old/usr/src/lib/libintl/sparcv9/Makefile	2019-07-05 17:33:03.921367969 +0000
+++ new/usr/src/lib/libintl/sparcv9/Makefile	2019-07-05 17:33:03.941262791 +0000
@@ -27,6 +27,7 @@
 include		../Makefile.com
 include		$(SRC)/lib/Makefile.lib.64
 
-install:	all $(ROOTLIBDIR64) .WAIT $(ROOTLIBS64) $(ROOTLINKS64)
+install:	all $(ROOTLIBDIR64) .WAIT $(ROOTLIBS64) $(ROOTLINKS64) \
+	$(ROOTCOMPATLINKS64)
 
 include		$(SRC)/lib/Makefile.filter.targ
--- old/usr/src/lib/libkstat/amd64/Makefile	2019-07-05 17:33:04.398251244 +0000
+++ new/usr/src/lib/libkstat/amd64/Makefile	2019-07-05 17:33:04.411272539 +0000
@@ -22,7 +22,7 @@
 # Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
+
 #
 
 include ../Makefile.com
@@ -32,4 +32,4 @@
 
 all: $(LIBS)
 
-install: all $(ROOTLIBS64) $(ROOTLINKS64)
+install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64)
--- old/usr/src/lib/libkstat/i386/Makefile	2019-07-05 17:33:04.866105129 +0000
+++ new/usr/src/lib/libkstat/i386/Makefile	2019-07-05 17:33:04.883433264 +0000
@@ -22,7 +22,7 @@
 # Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
+
 #
 
 include ../Makefile.com
@@ -31,4 +31,4 @@
 
 all: $(LIBS)
 
-install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT)
+install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) $(ROOTCOMPATLINKS)
--- old/usr/src/lib/libkstat/sparc/Makefile	2019-07-05 17:33:05.346477699 +0000
+++ new/usr/src/lib/libkstat/sparc/Makefile	2019-07-05 17:33:05.363590588 +0000
@@ -22,7 +22,7 @@
 # Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
+
 #
 
 include ../Makefile.com
@@ -31,4 +31,4 @@
 
 all: $(LIBS)
 
-install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT)
+install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) $(ROOTCOMPATLINKS)
--- old/usr/src/lib/libkstat/sparcv9/Makefile	2019-07-05 17:33:05.805587511 +0000
+++ new/usr/src/lib/libkstat/sparcv9/Makefile	2019-07-05 17:33:05.822709390 +0000
@@ -22,7 +22,7 @@
 # Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
+
 #
 
 include ../Makefile.com
@@ -32,4 +32,4 @@
 
 all: $(LIBS)
 
-install: all $(ROOTLIBS64) $(ROOTLINKS64)
+install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64)
--- old/usr/src/lib/libm/amd64/Makefile	2019-07-05 17:33:06.285854145 +0000
+++ new/usr/src/lib/libm/amd64/Makefile	2019-07-05 17:33:06.303426000 +0000
@@ -17,6 +17,6 @@
 include ../Makefile.com
 include $(SRC)/lib/Makefile.lib.64
 
-install: all $(ROOTLIBS64) $(ROOTLINKS64)
+install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64)
 
 include ../Makefile.targ
--- old/usr/src/lib/libm/i386/Makefile	2019-07-05 17:33:06.753909940 +0000
+++ new/usr/src/lib/libm/i386/Makefile	2019-07-05 17:33:06.770937216 +0000
@@ -23,6 +23,6 @@
 CFLAGS		+= -_gcc=-ffloat-store
 $(OBJS_M9XSSE)	:= CFLAGS += -xarch=sse2
 
-install: 	all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT)
+install:	all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) $(ROOTCOMPATLINKS)
 
 include ../Makefile.targ
--- old/usr/src/lib/libm/sparc/Makefile	2019-07-05 17:33:07.226069489 +0000
+++ new/usr/src/lib/libm/sparc/Makefile	2019-07-05 17:33:07.242208161 +0000
@@ -18,6 +18,6 @@
 
 CHIP		= ultra
 
-install: 	all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT)
+install:	all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) $(ROOTCOMPATLINKS)
 
 include ../Makefile.targ
--- old/usr/src/lib/libm/sparcv9/Makefile	2019-07-05 17:33:07.676625741 +0000
+++ new/usr/src/lib/libm/sparcv9/Makefile	2019-07-05 17:33:07.694277511 +0000
@@ -20,6 +20,6 @@
 
 CHIP		= ultra
 
-install: 	all $(ROOTLIBS64) $(ROOTLINKS64)
+install:	all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64)
 
 include ../Makefile.targ
--- old/usr/src/lib/libm1/Makefile.com	2019-07-05 17:33:08.165842211 +0000
+++ new/usr/src/lib/libm1/Makefile.com	2019-07-05 17:33:08.182491972 +0000
@@ -14,8 +14,8 @@
 #
 
 
-LIBRARY 	= libm.a
-VERS 		= .1
+LIBRARY		= libm.a
+VERS		= .1
 
 LIBMDIR		= $(SRC)/lib/libm
 
@@ -23,16 +23,19 @@
 
 include		$(SRC)/lib/Makefile.lib
 include		$(SRC)/lib/Makefile.rootfs
-include 	$(LIBMDIR)/Makefile.libm.com
+include		$(LIBMDIR)/Makefile.libm.com
 
-LIBS 		= $(DYNLIB)
+LIBS		= $(DYNLIB)
 SRCS		= $(OBJECTS:%.o=../common/%.c)
 SRCDIR		= ../common/
 
 CPPFLAGS	+= -DLIBM_BUILD
 MAPFILEDIR	= ../common/
-DYNFLAGS 	+= -zignore -Wl,-F'libm.so.2'
-LINTFLAGS64     += -errchk=longptr64
+DYNFLAGS	+= -zignore -Wl,-F'libm.so.2'
+LINTFLAGS64	+= -errchk=longptr64
+
+COMPATLINKS	= /usr/lib/$(DYNLIB)
+COMPATLINKS64	= /usr/lib/$(MACH64)/$(DYNLIB)
 
 .KEEP_STATE:
 
--- old/usr/src/lib/libm1/amd64/Makefile	2019-07-05 17:33:08.619875045 +0000
+++ new/usr/src/lib/libm1/amd64/Makefile	2019-07-05 17:33:08.637412283 +0000
@@ -18,6 +18,6 @@
 include ../Makefile.com
 include $(SRC)/lib/Makefile.lib.64
 
-install: all $(ROOTLIBS64)
+install: all $(ROOTLIBS64) $(ROOTCOMPATLINKS64)
 
 include $(SRC)/lib/Makefile.targ
--- old/usr/src/lib/libm1/i386/Makefile	2019-07-05 17:33:09.095324426 +0000
+++ new/usr/src/lib/libm1/i386/Makefile	2019-07-05 17:33:09.115083521 +0000
@@ -16,6 +16,6 @@
 TARGET_ARCH=	i386
 include ../Makefile.com
 
-install: all $(ROOTLIBS)
+install: all $(ROOTLIBS) $(ROOTCOMPATLINKS)
 
 include $(SRC)/lib/Makefile.targ
--- old/usr/src/lib/libm1/sparc/Makefile	2019-07-05 17:33:09.581855965 +0000
+++ new/usr/src/lib/libm1/sparc/Makefile	2019-07-05 17:33:09.599133880 +0000
@@ -17,6 +17,6 @@
 
 include ../Makefile.com
 
-install: all $(ROOTLIBS)
+install: all $(ROOTLIBS) $(ROOTCOMPATLINKS)
 
 include $(SRC)/lib/Makefile.targ
--- old/usr/src/lib/libm1/sparcv9/Makefile	2019-07-05 17:33:10.062004773 +0000
+++ new/usr/src/lib/libm1/sparcv9/Makefile	2019-07-05 17:33:10.079683916 +0000
@@ -18,6 +18,6 @@
 include ../Makefile.com
 include $(SRC)/lib/Makefile.lib.64
 
-install: all $(ROOTLIBS64)
+install: all $(ROOTLIBS64) $(ROOTCOMPATLINKS64)
 
 include $(SRC)/lib/Makefile.targ
--- old/usr/src/lib/libmalloc/Makefile.com	2019-07-05 17:33:10.550575083 +0000
+++ new/usr/src/lib/libmalloc/Makefile.com	2019-07-05 17:33:10.567586731 +0000
@@ -22,13 +22,11 @@
 # Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
-#
 
 LIBRARY=	libmalloc.a
 VERS=		.1
 
-OBJECTS= 	malloc.o
+OBJECTS=	malloc.o
 
 # include library definitions
 include ../../Makefile.lib
@@ -46,6 +44,13 @@
 DYNFLAGS +=	$(ZINTERPOSE)
 LDLIBS +=	-lc
 
+COMPATLINKS=	/usr/ccs/lib/libmalloc.so \
+		/usr/ccs/lib/$(MACH64)/libmalloc.so
+
+$(ROOT)/usr/ccs/lib/libmalloc.so := COMPATLINKTARGET=../../lib/libmalloc.so.1
+$(ROOT)/usr/ccs/lib/$(MACH64)/libmalloc.so:= \
+	COMPATLINKTARGET=../../../lib/$(MACH64)/libmalloc.so.1
+
 .KEEP_STATE:
 
 lint: lintcheck
--- old/usr/src/lib/libmalloc/amd64/Makefile	2019-07-05 17:33:11.044111751 +0000
+++ new/usr/src/lib/libmalloc/amd64/Makefile	2019-07-05 17:33:11.061167955 +0000
@@ -22,7 +22,7 @@
 # Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
+
 #
 
 include ../Makefile.com
@@ -32,4 +32,4 @@
 
 all: $(LIBS)
 
-install: all $(ROOTLIBS64) $(ROOTLINKS64)
+install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64)
--- old/usr/src/lib/libmalloc/i386/Makefile	2019-07-05 17:33:11.513665588 +0000
+++ new/usr/src/lib/libmalloc/i386/Makefile	2019-07-05 17:33:11.529859994 +0000
@@ -22,7 +22,7 @@
 # Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
+
 #
 
 include ../Makefile.com
@@ -31,4 +31,5 @@
 
 all: $(LIBS)
 
-install: all $(ROOTLIBS) $(ROOTLINKS) $(DYNLINKLIB) $(ROOTLINT)
+install: all $(ROOTLIBS) $(ROOTLINKS) $(DYNLINKLIB) $(ROOTLINT) \
+	$(ROOTCOMPATLINKS)
--- old/usr/src/lib/libmalloc/sparc/Makefile	2019-07-05 17:33:11.970164760 +0000
+++ new/usr/src/lib/libmalloc/sparc/Makefile	2019-07-05 17:33:11.989517164 +0000
@@ -22,7 +22,7 @@
 # Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
+
 #
 
 include ../Makefile.com
@@ -31,4 +31,5 @@
 
 all: $(LIBS)
 
-install: all $(ROOTLIBS) $(ROOTLINKS) $(DYNLINKLIB) $(ROOTLINT)
+install: all $(ROOTLIBS) $(ROOTLINKS) $(DYNLINKLIB) $(ROOTLINT) \
+	$(ROOTCOMPATLINKS)
--- old/usr/src/lib/libmalloc/sparcv9/Makefile	2019-07-05 17:33:12.466398585 +0000
+++ new/usr/src/lib/libmalloc/sparcv9/Makefile	2019-07-05 17:33:12.484964590 +0000
@@ -22,7 +22,7 @@
 # Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
+
 #
 
 include ../Makefile.com
@@ -32,4 +32,4 @@
 
 all: $(LIBS)
 
-install: all $(ROOTLIBS64) $(ROOTLINKS64)
+install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64)
--- old/usr/src/lib/libmd/amd64/Makefile	2019-07-05 17:33:12.949982804 +0000
+++ new/usr/src/lib/libmd/amd64/Makefile	2019-07-05 17:33:12.966978815 +0000
@@ -59,7 +59,7 @@
 
 all:		$(LIBS)
 
-install:	all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTLINT64)
+install:	all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTLINT64) $(ROOTCOMPATLINKS64)
 
 lint:		lintcheck
 
--- old/usr/src/lib/libmd/i386/Makefile	2019-07-05 17:33:13.419250226 +0000
+++ new/usr/src/lib/libmd/i386/Makefile	2019-07-05 17:33:13.436343590 +0000
@@ -38,7 +38,7 @@
 
 all:		$(LIBS)
 
-install:	all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT)
+install:	all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) $(ROOTCOMPATLINKS)
 
 lint:		lintcheck
 
--- old/usr/src/lib/libmd/sparc/Makefile	2019-07-05 17:33:13.901238700 +0000
+++ new/usr/src/lib/libmd/sparc/Makefile	2019-07-05 17:33:13.921200092 +0000
@@ -45,7 +45,7 @@
 
 all:		$(LIBS)
 
-install:	all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT)
+install:	all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) $(ROOTCOMPATLINKS)
 
 lint:		lintcheck
 
--- old/usr/src/lib/libmd/sparcv9/Makefile	2019-07-05 17:33:14.400142430 +0000
+++ new/usr/src/lib/libmd/sparcv9/Makefile	2019-07-05 17:33:14.416289254 +0000
@@ -35,14 +35,14 @@
 include		../Makefile.com
 
 # Symbol capabilities objects are added for sun4u and sun4v.
-EXTPICS = 	../capabilities/sun4u/sparcv9/pics/symcap.o \
+EXTPICS =	../capabilities/sun4u/sparcv9/pics/symcap.o \
 		../capabilities/sun4v/sparcv9/pics/symcap.o
 
 .KEEP_STATE:
 
 all:		$(LIBS)
 
-install:	all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTLINT64)
+install:	all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTLINT64) $(ROOTCOMPATLINKS64)
 
 lint:		lintcheck
 
--- old/usr/src/lib/libmd5/amd64/Makefile	2019-07-05 17:33:14.883902806 +0000
+++ new/usr/src/lib/libmd5/amd64/Makefile	2019-07-05 17:33:14.901595552 +0000
@@ -27,6 +27,7 @@
 include		../Makefile.com
 include		$(SRC)/lib/Makefile.lib.64
 
-install:	all $(ROOTLIBDIR64) .WAIT $(ROOTLIBS64) $(ROOTLINKS64)
+install:	all $(ROOTLIBDIR64) .WAIT $(ROOTLIBS64) $(ROOTLINKS64) \
+	$(ROOTCOMPATLINKS64)
 
 include		$(SRC)/lib/Makefile.filter.targ
--- old/usr/src/lib/libmd5/i386/Makefile	2019-07-05 17:33:15.362729490 +0000
+++ new/usr/src/lib/libmd5/i386/Makefile	2019-07-05 17:33:15.379992979 +0000
@@ -26,6 +26,7 @@
 include		$(SRC)/lib/Makefile.filter.com
 include		../Makefile.com
 
-install:	all $(ROOTLIBDIR) .WAIT $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT)
+install:	all $(ROOTLIBDIR) .WAIT $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) \
+	$(ROOTCOMPATLINKS)
 
 include		$(SRC)/lib/Makefile.filter.targ
--- old/usr/src/lib/libmd5/sparc/Makefile	2019-07-05 17:33:15.821165944 +0000
+++ new/usr/src/lib/libmd5/sparc/Makefile	2019-07-05 17:33:15.837327685 +0000
@@ -26,6 +26,7 @@
 include		$(SRC)/lib/Makefile.filter.com
 include		../Makefile.com
 
-install:	all $(ROOTLIBDIR) .WAIT $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT)
+install:	all $(ROOTLIBDIR) .WAIT $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) \
+	$(ROOTCOMPATLINKS)
 
 include		$(SRC)/lib/Makefile.filter.targ
--- old/usr/src/lib/libmd5/sparcv9/Makefile	2019-07-05 17:33:16.292629764 +0000
+++ new/usr/src/lib/libmd5/sparcv9/Makefile	2019-07-05 17:33:16.309314887 +0000
@@ -27,6 +27,7 @@
 include		../Makefile.com
 include		$(SRC)/lib/Makefile.lib.64
 
-install:	all $(ROOTLIBDIR64) .WAIT $(ROOTLIBS64) $(ROOTLINKS64)
+install:	all $(ROOTLIBDIR64) .WAIT $(ROOTLIBS64) $(ROOTLINKS64) \
+	$(ROOTCOMPATLINKS64)
 
 include		$(SRC)/lib/Makefile.filter.targ
--- old/usr/src/lib/libmp/Makefile.com	2019-07-05 17:33:16.773825323 +0000
+++ new/usr/src/lib/libmp/Makefile.com	2019-07-05 17:33:16.790929012 +0000
@@ -22,8 +22,6 @@
 # Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
-#
 
 LIBRARY=	libmp.a
 VERS=		.2
@@ -36,6 +34,9 @@
 # install this library in the root filesystem
 include ../../Makefile.rootfs
 
+COMPATLINKS += /usr/lib/libmp.so.1
+$(ROOT)/usr/lib/libmp.so.1 := COMPATLINKTARGET=../../lib/libmp.so.1
+
 SRCDIR =	../common
 
 OMAPFILE =	../common/mapfile_1-vers
--- old/usr/src/lib/libmp/amd64/Makefile	2019-07-05 17:33:17.292379794 +0000
+++ new/usr/src/lib/libmp/amd64/Makefile	2019-07-05 17:33:17.310475976 +0000
@@ -22,7 +22,7 @@
 # Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
+
 #
 
 include ../Makefile.com
@@ -34,4 +34,4 @@
 
 all: $(LIBS)
 
-install: all $(ROOTLIBS64) $(ROOTLINKS64)
+install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64)
--- old/usr/src/lib/libmp/i386/Makefile	2019-07-05 17:33:17.776486105 +0000
+++ new/usr/src/lib/libmp/i386/Makefile	2019-07-05 17:33:17.795528522 +0000
@@ -22,7 +22,7 @@
 # Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
+
 #
 
 OLIBRARY =	libmp.so.1
@@ -51,4 +51,5 @@
 
 all: $(LIBS) $(OLIBRARY)
 
-install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLIBDIR)/$(OLIBRARY)
+install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLIBDIR)/$(OLIBRARY) \
+	$(ROOTCOMPATLINKS)
--- old/usr/src/lib/libmp/sparc/Makefile	2019-07-05 17:33:18.235380077 +0000
+++ new/usr/src/lib/libmp/sparc/Makefile	2019-07-05 17:33:18.251785996 +0000
@@ -22,7 +22,7 @@
 # Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
+
 #
 
 OLIBRARY =	libmp.so.1
@@ -51,4 +51,5 @@
 
 all: $(LIBS) $(OLIBRARY)
 
-install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLIBDIR)/$(OLIBRARY)
+install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLIBDIR)/$(OLIBRARY) \
+	$(ROOTCOMPATLINKS)
--- old/usr/src/lib/libmp/sparcv9/Makefile	2019-07-05 17:33:18.684161531 +0000
+++ new/usr/src/lib/libmp/sparcv9/Makefile	2019-07-05 17:33:18.700738752 +0000
@@ -22,7 +22,7 @@
 # Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
+
 #
 
 include ../Makefile.com
@@ -34,4 +34,4 @@
 
 all: $(LIBS)
 
-install: all $(ROOTLIBS64) $(ROOTLINKS64)
+install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64)
--- old/usr/src/lib/libmvec/amd64/Makefile	2019-07-05 17:33:19.168713361 +0000
+++ new/usr/src/lib/libmvec/amd64/Makefile	2019-07-05 17:33:19.186714100 +0000
@@ -15,8 +15,8 @@
 
 TARGET_ARCH	= amd64
 
-LIBRARY 	= libmvec.a
-VERS 		= .1
+LIBRARY		= libmvec.a
+VERS		= .1
 
 OBJECTS		= $(mvecOBJS)
 
@@ -25,6 +25,6 @@
 
 SRCS		= $(SRCS_mvec)
 
-install: all $(ROOTLIBS64) $(ROOTLINKS64)
+install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64)
 
 include $(SRC)/lib/libm/Makefile.targ
--- old/usr/src/lib/libmvec/i386/Makefile	2019-07-05 17:33:19.651906109 +0000
+++ new/usr/src/lib/libmvec/i386/Makefile	2019-07-05 17:33:19.668149522 +0000
@@ -15,8 +15,8 @@
 
 TARGET_ARCH=	i386
 
-LIBRARY 	= libmvec.a
-VERS 		= .1
+LIBRARY		= libmvec.a
+VERS		= .1
 
 OBJECTS		= $(mvecOBJS)
 
@@ -24,6 +24,6 @@
 
 SRCS		= $(SRCS_mvec)
 
-install: all $(ROOTLIBS) $(ROOTLINKS)
+install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTCOMPATLINKS)
 
 include $(SRC)/lib/libm/Makefile.targ
--- old/usr/src/lib/libmvec/sparc/Makefile	2019-07-05 17:33:20.124366583 +0000
+++ new/usr/src/lib/libmvec/sparc/Makefile	2019-07-05 17:33:20.140176865 +0000
@@ -15,8 +15,8 @@
 
 TARGET_ARCH=	sparc
 
-LIBRARY 	= libmvec.a
-VERS 		= .1
+LIBRARY		= libmvec.a
+VERS		= .1
 
 OBJECTS		= $(mvecOBJS)
 
@@ -25,6 +25,6 @@
 CHIP		= ultra
 SRCS		= $(SRCS_mvec)
 
-install: 	all $(ROOTLIBS) $(ROOTLINKS)
+install:	all $(ROOTLIBS) $(ROOTLINKS) $(ROOTCOMPATLINKS)
 
 include $(SRC)/lib/Makefile.targ
--- old/usr/src/lib/libmvec/sparcv9/Makefile	2019-07-05 17:33:20.581034233 +0000
+++ new/usr/src/lib/libmvec/sparcv9/Makefile	2019-07-05 17:33:20.597555258 +0000
@@ -15,8 +15,8 @@
 
 TARGET_ARCH	= sparcv9
 
-LIBRARY 	= libmvec.a
-VERS 		= .1
+LIBRARY		= libmvec.a
+VERS		= .1
 
 OBJECTS		= $(mvecOBJS)
 
@@ -27,6 +27,6 @@
 
 SRCS		= $(SRCS_mvec)
 
-install: all $(ROOTLIBS64) $(ROOTLINKS64) 
+install: all $(ROOTLIBS64) $(ROOTLINKS64)  $(ROOTCOMPATLINKS64)
 
 include $(SRC)/lib/libm/Makefile.targ
--- old/usr/src/lib/libnsl/amd64/Makefile	2019-07-05 17:33:21.040511989 +0000
+++ new/usr/src/lib/libnsl/amd64/Makefile	2019-07-05 17:33:21.058843394 +0000
@@ -23,7 +23,7 @@
 # Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
+
 #
 
 include ../Makefile.com
@@ -35,4 +35,4 @@
 
 amd64_C_PICFLAGS = $(amd64_C_BIGPICFLAGS)
 
-install: all $(ROOTLIBS64) $(ROOTLINKS64)
+install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64)
--- old/usr/src/lib/libnsl/i386/Makefile	2019-07-05 17:33:21.521611100 +0000
+++ new/usr/src/lib/libnsl/i386/Makefile	2019-07-05 17:33:21.538697354 +0000
@@ -23,9 +23,9 @@
 # Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
+
 #
 
 include ../Makefile.com
 
-install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT)
+install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) $(ROOTCOMPATLINKS)
--- old/usr/src/lib/libnsl/sparc/Makefile	2019-07-05 17:33:22.007171524 +0000
+++ new/usr/src/lib/libnsl/sparc/Makefile	2019-07-05 17:33:22.028712640 +0000
@@ -23,9 +23,9 @@
 # Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
+
 #
 
 include ../Makefile.com
 
-install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT)
+install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) $(ROOTCOMPATLINKS)
--- old/usr/src/lib/libnsl/sparcv9/Makefile	2019-07-05 17:33:22.516384383 +0000
+++ new/usr/src/lib/libnsl/sparcv9/Makefile	2019-07-05 17:33:22.534494889 +0000
@@ -33,4 +33,4 @@
 
 sparcv9_C_PICFLAGS = $(sparcv9_C_BIGPICFLAGS)
 
-install: all $(ROOTLIBS64) $(ROOTLINKS64)
+install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64)
--- old/usr/src/lib/libnvpair/amd64/Makefile	2019-07-05 17:33:23.004465427 +0000
+++ new/usr/src/lib/libnvpair/amd64/Makefile	2019-07-05 17:33:23.023521668 +0000
@@ -23,10 +23,10 @@
 # Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
+
 #
 
 include ../Makefile.com
 include ../../Makefile.lib.64
 
-install: all $(ROOTLIBS64) $(ROOTLINKS64)
+install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64)
--- old/usr/src/lib/libnvpair/i386/Makefile	2019-07-05 17:33:23.505104260 +0000
+++ new/usr/src/lib/libnvpair/i386/Makefile	2019-07-05 17:33:23.523632819 +0000
@@ -23,9 +23,9 @@
 # Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
+
 #
 
 include ../Makefile.com
 
-install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT)
+install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) $(ROOTCOMPATLINKS)
--- old/usr/src/lib/libnvpair/sparc/Makefile	2019-07-05 17:33:24.038523158 +0000
+++ new/usr/src/lib/libnvpair/sparc/Makefile	2019-07-05 17:33:24.061731863 +0000
@@ -23,9 +23,9 @@
 # Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
+
 #
 
 include ../Makefile.com
 
-install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT)
+install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) $(ROOTCOMPATLINKS)
--- old/usr/src/lib/libnvpair/sparcv9/Makefile	2019-07-05 17:33:24.532421686 +0000
+++ new/usr/src/lib/libnvpair/sparcv9/Makefile	2019-07-05 17:33:24.550758788 +0000
@@ -23,10 +23,10 @@
 # Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
+
 #
 
 include ../Makefile.com
 include ../../Makefile.lib.64
 
-install: all $(ROOTLIBS64) $(ROOTLINKS64)
+install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64)
--- old/usr/src/lib/libpam/amd64/Makefile	2019-07-05 17:33:25.032223614 +0000
+++ new/usr/src/lib/libpam/amd64/Makefile	2019-07-05 17:33:25.051088491 +0000
@@ -23,10 +23,10 @@
 # Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
+
 #
 
 include		../Makefile.com
 include		../../Makefile.lib.64
 
-install: all $(ROOTLIBS64) $(ROOTLINKS64)
+install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64)
--- old/usr/src/lib/libpam/i386/Makefile	2019-07-05 17:33:25.513185786 +0000
+++ new/usr/src/lib/libpam/i386/Makefile	2019-07-05 17:33:25.523172961 +0000
@@ -25,8 +25,8 @@
 #
 # usr/src/lib/libpam/i386/Makefile
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
+
 
 include ../Makefile.com
 
-install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT)
+install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) $(ROOTCOMPATLINKS)
--- old/usr/src/lib/libpam/sparc/Makefile	2019-07-05 17:33:25.988655709 +0000
+++ new/usr/src/lib/libpam/sparc/Makefile	2019-07-05 17:33:26.008032774 +0000
@@ -25,8 +25,8 @@
 #
 # usr/src/lib/libpam/sparc/Makefile
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
+
 
 include		../Makefile.com
 
-install:	all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT)
+install:	all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) $(ROOTCOMPATLINKS)
--- old/usr/src/lib/libpam/sparcv9/Makefile	2019-07-05 17:33:26.498790769 +0000
+++ new/usr/src/lib/libpam/sparcv9/Makefile	2019-07-05 17:33:26.516637715 +0000
@@ -25,9 +25,9 @@
 #
 # lib/libpam/sparcv9/Makefile
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
+
 
 include		../Makefile.com
 include		../../Makefile.lib.64
 
-install: all $(ROOTLIBS64) $(ROOTLINKS64)
+install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64)
--- old/usr/src/lib/libproc/amd64/Makefile	2019-07-05 17:33:27.003345440 +0000
+++ new/usr/src/lib/libproc/amd64/Makefile	2019-07-05 17:33:27.025797532 +0000
@@ -32,4 +32,4 @@
 CPPFLAGS += -D_SYSCALL32
 LDLIBS += -lsaveargs
 
-install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTLINT64)
+install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTLINT64) $(ROOTCOMPATLINKS64)
--- old/usr/src/lib/libproc/i386/Makefile	2019-07-05 17:33:27.507266664 +0000
+++ new/usr/src/lib/libproc/i386/Makefile	2019-07-05 17:33:27.524006398 +0000
@@ -23,9 +23,9 @@
 # Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
+
 #
 
 include ../Makefile.com
 
-install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT)
+install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) $(ROOTCOMPATLINKS)
--- old/usr/src/lib/libproc/sparc/Makefile	2019-07-05 17:33:27.980394892 +0000
+++ new/usr/src/lib/libproc/sparc/Makefile	2019-07-05 17:33:27.998170111 +0000
@@ -23,9 +23,9 @@
 # Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
+
 #
 
 include ../Makefile.com
 
-install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT)
+install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) $(ROOTCOMPATLINKS)
--- old/usr/src/lib/libproc/sparcv9/Makefile	2019-07-05 17:33:28.467137452 +0000
+++ new/usr/src/lib/libproc/sparcv9/Makefile	2019-07-05 17:33:28.485493765 +0000
@@ -31,4 +31,4 @@
 
 CPPFLAGS += -D_SYSCALL32
 
-install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTLINT64)
+install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTLINT64) $(ROOTCOMPATLINKS64)
--- old/usr/src/lib/libpthread/amd64/Makefile	2019-07-05 17:33:28.937543236 +0000
+++ new/usr/src/lib/libpthread/amd64/Makefile	2019-07-05 17:33:28.954039225 +0000
@@ -27,6 +27,7 @@
 include		../Makefile.com
 include		$(SRC)/lib/Makefile.lib.64
 
-install:	all $(ROOTLIBDIR64) .WAIT $(ROOTLIBS64) $(ROOTLINKS64)
+install:	all $(ROOTLIBDIR64) .WAIT $(ROOTLIBS64) $(ROOTLINKS64) \
+	$(ROOTCOMPATLINKS64)
 
 include		$(SRC)/lib/Makefile.filter.targ
--- old/usr/src/lib/libpthread/i386/Makefile	2019-07-05 17:33:29.396029469 +0000
+++ new/usr/src/lib/libpthread/i386/Makefile	2019-07-05 17:33:29.412110364 +0000
@@ -26,6 +26,7 @@
 include		$(SRC)/lib/Makefile.filter.com
 include		../Makefile.com
 
-install:	all $(ROOTLIBDIR) .WAIT $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT)
+install:	all $(ROOTLIBDIR) .WAIT $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) \
+	$(ROOTCOMPATLINKS)
 
 include		$(SRC)/lib/Makefile.filter.targ
--- old/usr/src/lib/libpthread/sparc/Makefile	2019-07-05 17:33:29.827334236 +0000
+++ new/usr/src/lib/libpthread/sparc/Makefile	2019-07-05 17:33:29.842904959 +0000
@@ -26,6 +26,7 @@
 include		$(SRC)/lib/Makefile.filter.com
 include		../Makefile.com
 
-install:	all $(ROOTLIBDIR) .WAIT $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT)
+install:	all $(ROOTLIBDIR) .WAIT $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) \
+	$(ROOTCOMPATLINKS)
 
 include		$(SRC)/lib/Makefile.filter.targ
--- old/usr/src/lib/libpthread/sparcv9/Makefile	2019-07-05 17:33:30.255880522 +0000
+++ new/usr/src/lib/libpthread/sparcv9/Makefile	2019-07-05 17:33:30.272019657 +0000
@@ -27,6 +27,7 @@
 include		../Makefile.com
 include		$(SRC)/lib/Makefile.lib.64
 
-install:	all $(ROOTLIBDIR64) .WAIT $(ROOTLIBS64) $(ROOTLINKS64)
+install:	all $(ROOTLIBDIR64) .WAIT $(ROOTLIBS64) $(ROOTLINKS64) \
+	$(ROOTCOMPATLINKS64)
 
 include		$(SRC)/lib/Makefile.filter.targ
--- old/usr/src/lib/librcm/amd64/Makefile	2019-07-05 17:33:30.691395161 +0000
+++ new/usr/src/lib/librcm/amd64/Makefile	2019-07-05 17:33:30.708033998 +0000
@@ -23,10 +23,10 @@
 # Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
+
 #
 
 include ../Makefile.com
 include ../../Makefile.lib.64
 
-install: all $(ROOTLIBS64) $(ROOTLINKS64)
+install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64)
--- old/usr/src/lib/librcm/i386/Makefile	2019-07-05 17:33:31.115696202 +0000
+++ new/usr/src/lib/librcm/i386/Makefile	2019-07-05 17:33:31.132342869 +0000
@@ -23,9 +23,9 @@
 # Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
+
 #
 
 include ../Makefile.com
 
-install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT)
+install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) $(ROOTCOMPATLINKS)
--- old/usr/src/lib/librcm/sparc/Makefile	2019-07-05 17:33:31.571094799 +0000
+++ new/usr/src/lib/librcm/sparc/Makefile	2019-07-05 17:33:31.589419625 +0000
@@ -23,9 +23,9 @@
 # Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
+
 #
 
 include ../Makefile.com
 
-install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT)
+install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) $(ROOTCOMPATLINKS)
--- old/usr/src/lib/librcm/sparcv9/Makefile	2019-07-05 17:33:32.079385495 +0000
+++ new/usr/src/lib/librcm/sparcv9/Makefile	2019-07-05 17:33:32.096664843 +0000
@@ -23,10 +23,10 @@
 # Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
+
 #
 
 include ../Makefile.com
 include ../../Makefile.lib.64
 
-install: all $(ROOTLIBS64) $(ROOTLINKS64)
+install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64)
--- old/usr/src/lib/libresolv/Makefile	2019-07-05 17:33:32.570005815 +0000
+++ new/usr/src/lib/libresolv/Makefile	2019-07-05 17:33:32.587722749 +0000
@@ -66,13 +66,15 @@
 
 ROOTDYNLIBS=	$(DYNLIB:%=$(ROOTLIBDIR)/%)
 
+COMPATLINKS=	/usr/lib/$(DYNLIB)
+
 .KEEP_STATE:
 
 LIBS = $(DYNLIB)
 
 all: $(LIBS)
 
-install: all $(ROOTDYNLIBS)
+install: all $(ROOTDYNLIBS) $(ROOTCOMPATLINKS)
 
 lint: lintcheck
 
--- old/usr/src/lib/libresolv2/amd64/Makefile	2019-07-05 17:33:33.083035645 +0000
+++ new/usr/src/lib/libresolv2/amd64/Makefile	2019-07-05 17:33:33.099159853 +0000
@@ -22,10 +22,10 @@
 # Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
+
 #
 
 include ../Makefile.com
 include ../../Makefile.lib.64
 
-install: all $(ROOTLIBS64) $(ROOTLINKS64)
+install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64)
--- old/usr/src/lib/libresolv2/i386/Makefile	2019-07-05 17:33:33.536536021 +0000
+++ new/usr/src/lib/libresolv2/i386/Makefile	2019-07-05 17:33:33.552719611 +0000
@@ -22,9 +22,9 @@
 # Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
+
 #
 
 include ../Makefile.com
 
-install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT)
+install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) $(ROOTCOMPATLINKS)
--- old/usr/src/lib/libresolv2/sparc/Makefile	2019-07-05 17:33:33.982434640 +0000
+++ new/usr/src/lib/libresolv2/sparc/Makefile	2019-07-05 17:33:34.000117303 +0000
@@ -22,9 +22,9 @@
 # Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
+
 #
 
 include ../Makefile.com
 
-install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT)
+install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) $(ROOTCOMPATLINKS)
--- old/usr/src/lib/libresolv2/sparcv9/Makefile	2019-07-05 17:33:34.482213216 +0000
+++ new/usr/src/lib/libresolv2/sparcv9/Makefile	2019-07-05 17:33:34.501010062 +0000
@@ -33,4 +33,4 @@
 
 sparcv9_C_PICFLAGS = $(sparcv9_C_BIGPICFLAGS)
 
-install: all $(ROOTLIBS64) $(ROOTLINKS64)
+install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64)
--- old/usr/src/lib/librestart/amd64/Makefile	2019-07-05 17:33:34.925283831 +0000
+++ new/usr/src/lib/librestart/amd64/Makefile	2019-07-05 17:33:34.941737071 +0000
@@ -23,7 +23,7 @@
 # Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
+
 #
 
 include ../Makefile.com
@@ -31,4 +31,4 @@
 
 all: $(LIBS)
 
-install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTLINT)
+install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTLINT) $(ROOTCOMPATLINKS64)
--- old/usr/src/lib/librestart/i386/Makefile	2019-07-05 17:33:35.364152667 +0000
+++ new/usr/src/lib/librestart/i386/Makefile	2019-07-05 17:33:35.379489497 +0000
@@ -23,11 +23,11 @@
 # Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
+
 #
 
 include ../Makefile.com
 
 all: $(LIBS)
 
-install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT)
+install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) $(ROOTCOMPATLINKS)
--- old/usr/src/lib/librestart/sparc/Makefile	2019-07-05 17:33:35.790734931 +0000
+++ new/usr/src/lib/librestart/sparc/Makefile	2019-07-05 17:33:35.806777876 +0000
@@ -23,11 +23,11 @@
 # Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
+
 #
 
 include ../Makefile.com
 
 all: $(LIBS)
 
-install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT)
+install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) $(ROOTCOMPATLINKS)
--- old/usr/src/lib/librestart/sparcv9/Makefile	2019-07-05 17:33:36.268191307 +0000
+++ new/usr/src/lib/librestart/sparcv9/Makefile	2019-07-05 17:33:36.285304439 +0000
@@ -23,7 +23,7 @@
 # Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
+
 #
 
 include ../Makefile.com
@@ -33,4 +33,4 @@
 
 all: $(LIBS)
 
-install: all $(ROOTLIBS64) $(ROOTLINKS64)
+install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64)
--- old/usr/src/lib/librpcsvc/amd64/Makefile	2019-07-05 17:33:36.739181430 +0000
+++ new/usr/src/lib/librpcsvc/amd64/Makefile	2019-07-05 17:33:36.756413665 +0000
@@ -22,7 +22,7 @@
 # Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
+
 #
 
 include ../Makefile.com
@@ -30,4 +30,4 @@
 
 all: $(LIBS)
 
-install: all $(ROOTLIBS64) $(ROOTLINKS64)
+install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64)
--- old/usr/src/lib/librpcsvc/i386/Makefile	2019-07-05 17:33:37.214763834 +0000
+++ new/usr/src/lib/librpcsvc/i386/Makefile	2019-07-05 17:33:37.225969078 +0000
@@ -23,11 +23,11 @@
 # Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
+
 #
 
 include ../Makefile.com
 
 all: $(LIBS)
 
-install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT)
+install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) $(ROOTCOMPATLINKS)
--- old/usr/src/lib/librpcsvc/sparc/Makefile	2019-07-05 17:33:37.624670387 +0000
+++ new/usr/src/lib/librpcsvc/sparc/Makefile	2019-07-05 17:33:37.637607651 +0000
@@ -23,11 +23,11 @@
 # Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
+
 #
 
 include ../Makefile.com
 
 all: $(LIBS)
 
-install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT)
+install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) $(ROOTCOMPATLINKS)
--- old/usr/src/lib/librpcsvc/sparcv9/Makefile	2019-07-05 17:33:38.062600990 +0000
+++ new/usr/src/lib/librpcsvc/sparcv9/Makefile	2019-07-05 17:33:38.074798537 +0000
@@ -22,7 +22,7 @@
 # Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
+
 #
 
 include ../Makefile.com
@@ -30,4 +30,4 @@
 
 all: $(LIBS)
 
-install: all $(ROOTLIBS64) $(ROOTLINKS64)
+install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64)
--- old/usr/src/lib/librt/Makefile.com	2019-07-05 17:33:38.470349254 +0000
+++ new/usr/src/lib/librt/Makefile.com	2019-07-05 17:33:38.488548248 +0000
@@ -29,3 +29,28 @@
 
 LIBS +=		$(LINTLIB)
 DYNFLAGS +=	-F libc.so.1
+
+COMPATLINKS +=	/lib/libposix4.so.1 \
+		/lib/libposix4.so \
+		/usr/lib/libposix4.so.1 \
+		/usr/lib/libposix4.so
+
+COMPATLINKS64 +=/lib/$(MACH64)/libposix4.so.1 \
+		/lib/$(MACH64)/libposix4.so \
+		/usr/lib/$(MACH64)/libposix4.so.1 \
+		/usr/lib/$(MACH64)/libposix4.so
+
+$(ROOT)/lib/libposix4.so.1 := COMPATLINKTARGET=librt.so.1
+$(ROOT)/lib/libposix4.so := COMPATLINKTARGET=libposix4.so.1
+$(ROOT)/usr/lib/libposix4.so.1 := COMPATLINKTARGET=../../lib/librt.so.1
+$(ROOT)/usr/lib/libposix4.so := COMPATLINKTARGET=../../lib/librt.so.1
+$(ROOT)/lib/$(MACH64)/libposix4.so.1 := COMPATLINKTARGET=librt.so.1
+$(ROOT)/lib/$(MACH64)/libposix4.so := COMPATLINKTARGET=libposix4.so.1
+$(ROOT)/usr/lib/$(MACH64)/libposix4.so.1:= \
+	COMPATLINKTARGET=../../../lib/$(MACH64)/librt.so.1
+$(ROOT)/usr/lib/$(MACH64)/libposix4.so:= \
+	COMPATLINKTARGET=../../../lib/$(MACH64)/librt.so.1
+$(ROOT)/usr/lib/$(MACH64)/librt.so.1:= \
+	COMPATLINKTARGET=../../../lib/$(MACH64)/librt.so.1
+$(ROOT)/usr/lib/$(MACH64)/librt.so:= \
+	COMPATLINKTARGET=../../../lib/$(MACH64)/librt.so.1
--- old/usr/src/lib/librt/amd64/Makefile	2019-07-05 17:33:38.933851360 +0000
+++ new/usr/src/lib/librt/amd64/Makefile	2019-07-05 17:33:38.950697834 +0000
@@ -27,6 +27,7 @@
 include		../Makefile.com
 include		$(SRC)/lib/Makefile.lib.64
 
-install:	all $(ROOTLIBDIR64) .WAIT $(ROOTLIBS64) $(ROOTLINKS64)
+install:	all $(ROOTLIBDIR64) .WAIT $(ROOTLIBS64) $(ROOTLINKS64) \
+	$(ROOTCOMPATLINKS64)
 
 include		$(SRC)/lib/Makefile.filter.targ
--- old/usr/src/lib/librt/i386/Makefile	2019-07-05 17:33:39.419225258 +0000
+++ new/usr/src/lib/librt/i386/Makefile	2019-07-05 17:33:39.436367661 +0000
@@ -26,6 +26,7 @@
 include		$(SRC)/lib/Makefile.filter.com
 include		../Makefile.com
 
-install:	all $(ROOTLIBDIR) .WAIT $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT)
+install:	all $(ROOTLIBDIR) .WAIT $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) \
+	$(ROOTCOMPATLINKS)
 
 include		$(SRC)/lib/Makefile.filter.targ
--- old/usr/src/lib/librt/sparc/Makefile	2019-07-05 17:33:39.899374404 +0000
+++ new/usr/src/lib/librt/sparc/Makefile	2019-07-05 17:33:39.916338666 +0000
@@ -26,6 +26,7 @@
 include		$(SRC)/lib/Makefile.filter.com
 include		../Makefile.com
 
-install:	all $(ROOTLIBDIR) .WAIT $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT)
+install:	all $(ROOTLIBDIR) .WAIT $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) \
+	$(ROOTCOMPATLINKS)
 
 include		$(SRC)/lib/Makefile.filter.targ
--- old/usr/src/lib/librt/sparcv9/Makefile	2019-07-05 17:33:40.395563858 +0000
+++ new/usr/src/lib/librt/sparcv9/Makefile	2019-07-05 17:33:40.412843051 +0000
@@ -27,6 +27,7 @@
 include		../Makefile.com
 include		$(SRC)/lib/Makefile.lib.64
 
-install:	all $(ROOTLIBDIR64) .WAIT $(ROOTLIBS64) $(ROOTLINKS64)
+install:	all $(ROOTLIBDIR64) .WAIT $(ROOTLIBS64) $(ROOTLINKS64) \
+	$(ROOTCOMPATLINKS64)
 
 include		$(SRC)/lib/Makefile.filter.targ
--- old/usr/src/lib/libscf/amd64/Makefile	2019-07-05 17:33:40.874017362 +0000
+++ new/usr/src/lib/libscf/amd64/Makefile	2019-07-05 17:33:40.891265089 +0000
@@ -23,7 +23,7 @@
 # Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
+
 #
 
 include ../Makefile.com
@@ -31,4 +31,4 @@
 
 all: $(LIBS)
 
-install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTLINT)
+install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTLINT) $(ROOTCOMPATLINKS64)
--- old/usr/src/lib/libscf/i386/Makefile	2019-07-05 17:33:41.340071476 +0000
+++ new/usr/src/lib/libscf/i386/Makefile	2019-07-05 17:33:41.353163080 +0000
@@ -23,11 +23,11 @@
 # Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
+
 #
 
 include ../Makefile.com
 
 all: $(LIBS)
 
-install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT)
+install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) $(ROOTCOMPATLINKS)
--- old/usr/src/lib/libscf/sparc/Makefile	2019-07-05 17:33:41.799722883 +0000
+++ new/usr/src/lib/libscf/sparc/Makefile	2019-07-05 17:33:41.816138597 +0000
@@ -23,11 +23,11 @@
 # Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
+
 #
 
 include ../Makefile.com
 
 all: $(LIBS)
 
-install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT)
+install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) $(ROOTCOMPATLINKS)
--- old/usr/src/lib/libscf/sparcv9/Makefile	2019-07-05 17:33:42.272089063 +0000
+++ new/usr/src/lib/libscf/sparcv9/Makefile	2019-07-05 17:33:42.289739714 +0000
@@ -23,7 +23,7 @@
 # Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
+
 #
 
 include ../Makefile.com
@@ -33,4 +33,4 @@
 
 all: $(LIBS)
 
-install: all $(ROOTLIBS64) $(ROOTLINKS64)
+install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64)
--- old/usr/src/lib/libsec/amd64/Makefile	2019-07-05 17:33:42.751097307 +0000
+++ new/usr/src/lib/libsec/amd64/Makefile	2019-07-05 17:33:42.770693714 +0000
@@ -22,7 +22,7 @@
 # Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
+
 #
 
 include ../Makefile.com
@@ -34,4 +34,4 @@
 
 all: $(LIBS)
 
-install: all $(ROOTLIBS64) $(ROOTLINKS64)
+install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64)
--- old/usr/src/lib/libsec/i386/Makefile	2019-07-05 17:33:43.263569115 +0000
+++ new/usr/src/lib/libsec/i386/Makefile	2019-07-05 17:33:43.281604691 +0000
@@ -22,7 +22,7 @@
 # Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
+
 #
 
 include ../Makefile.com
@@ -31,4 +31,4 @@
 
 all: $(LIBS)
 
-install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT)
+install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) $(ROOTCOMPATLINKS)
--- old/usr/src/lib/libsec/sparc/Makefile	2019-07-05 17:33:43.734922786 +0000
+++ new/usr/src/lib/libsec/sparc/Makefile	2019-07-05 17:33:43.752739099 +0000
@@ -22,7 +22,7 @@
 # Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
+
 #
 
 include ../Makefile.com
@@ -31,4 +31,4 @@
 
 all: $(LIBS)
 
-install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT)
+install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) $(ROOTCOMPATLINKS)
--- old/usr/src/lib/libsec/sparcv9/Makefile	2019-07-05 17:33:44.275212326 +0000
+++ new/usr/src/lib/libsec/sparcv9/Makefile	2019-07-05 17:33:44.294361448 +0000
@@ -22,7 +22,7 @@
 # Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
+
 #
 
 include ../Makefile.com
@@ -34,4 +34,4 @@
 
 all: $(LIBS)
 
-install: all $(ROOTLIBS64) $(ROOTLINKS64)
+install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64)
--- old/usr/src/lib/libsecdb/amd64/Makefile	2019-07-05 17:33:44.770562280 +0000
+++ new/usr/src/lib/libsecdb/amd64/Makefile	2019-07-05 17:33:44.788123773 +0000
@@ -23,7 +23,7 @@
 # Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
+
 #
 
 
@@ -32,4 +32,4 @@
 
 .KEEP_STATE:
 
-install: all $(ROOTLIBS64) $(ROOTLINKS64)
+install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64)
--- old/usr/src/lib/libsecdb/i386/Makefile	2019-07-05 17:33:45.259143263 +0000
+++ new/usr/src/lib/libsecdb/i386/Makefile	2019-07-05 17:33:45.275646732 +0000
@@ -23,7 +23,7 @@
 # Copyright (c) 1999, 2001 by Sun Microsystems, Inc.
 # All rights reserved.
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
+
 #
 # libsecdb/i386/Makefile
 
@@ -33,4 +33,4 @@
 .KEEP_STATE:
 
 
-install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT)
+install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) $(ROOTCOMPATLINKS)
--- old/usr/src/lib/libsecdb/sparc/Makefile	2019-07-05 17:33:45.730961529 +0000
+++ new/usr/src/lib/libsecdb/sparc/Makefile	2019-07-05 17:33:45.749059590 +0000
@@ -25,11 +25,11 @@
 #
 # lib/libsecdb/sparc/Makefile
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
+
 #
 
 include ../Makefile.com
 
 .KEEP_STATE:
 
-install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT)
+install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) $(ROOTCOMPATLINKS)
--- old/usr/src/lib/libsecdb/sparcv9/Makefile	2019-07-05 17:33:46.225794324 +0000
+++ new/usr/src/lib/libsecdb/sparcv9/Makefile	2019-07-05 17:33:46.239188088 +0000
@@ -25,7 +25,7 @@
 #
 # lib/libsecdb/sparcv9/Makefile
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
+
 #
 
 
@@ -34,4 +34,4 @@
 
 .KEEP_STATE:
 
-install: all $(ROOTLIBS64) $(ROOTLINKS64)
+install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64)
--- old/usr/src/lib/libsendfile/amd64/Makefile	2019-07-05 17:33:46.632563441 +0000
+++ new/usr/src/lib/libsendfile/amd64/Makefile	2019-07-05 17:33:46.648060565 +0000
@@ -22,7 +22,7 @@
 # Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
+
 #
 
 MAPFILE32 =
@@ -30,4 +30,4 @@
 include ../Makefile.com
 include ../../Makefile.lib.64
 
-install: all $(ROOTLIBS64) $(ROOTLINKS64)
+install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64)
--- old/usr/src/lib/libsendfile/i386/Makefile	2019-07-05 17:33:47.121535622 +0000
+++ new/usr/src/lib/libsendfile/i386/Makefile	2019-07-05 17:33:47.140374627 +0000
@@ -24,4 +24,4 @@
 
 include ../Makefile.com
 
-install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT)
+install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) $(ROOTCOMPATLINKS)
--- old/usr/src/lib/libsendfile/sparc/Makefile	2019-07-05 17:33:47.596153998 +0000
+++ new/usr/src/lib/libsendfile/sparc/Makefile	2019-07-05 17:33:47.612386902 +0000
@@ -24,4 +24,4 @@
 
 include ../Makefile.com
 
-install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT)
+install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) $(ROOTCOMPATLINKS)
--- old/usr/src/lib/libsendfile/sparcv9/Makefile	2019-07-05 17:33:48.076373064 +0000
+++ new/usr/src/lib/libsendfile/sparcv9/Makefile	2019-07-05 17:33:48.094347421 +0000
@@ -22,7 +22,7 @@
 # Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
+
 #
 
 MAPFILE32 =
@@ -30,4 +30,4 @@
 include ../Makefile.com
 include ../../Makefile.lib.64
 
-install: all $(ROOTLIBS64) $(ROOTLINKS64)
+install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64)
--- old/usr/src/lib/libsocket/amd64/Makefile	2019-07-05 17:33:48.538624456 +0000
+++ new/usr/src/lib/libsocket/amd64/Makefile	2019-07-05 17:33:48.556985113 +0000
@@ -22,7 +22,7 @@
 # Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
+
 #
 
 include ../Makefile.com
@@ -30,4 +30,4 @@
 
 all: $(LIBS)
 
-install: all $(ROOTLIBS64) $(ROOTLINKS64)
+install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64)
--- old/usr/src/lib/libsocket/i386/Makefile	2019-07-05 17:33:49.013849313 +0000
+++ new/usr/src/lib/libsocket/i386/Makefile	2019-07-05 17:33:49.032224569 +0000
@@ -22,11 +22,11 @@
 # Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
+
 #
 
 include ../Makefile.com
 
 all: $(LIBS)
 
-install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT)
+install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) $(ROOTCOMPATLINKS)
--- old/usr/src/lib/libsocket/sparc/Makefile	2019-07-05 17:33:49.502792076 +0000
+++ new/usr/src/lib/libsocket/sparc/Makefile	2019-07-05 17:33:49.520246399 +0000
@@ -23,11 +23,11 @@
 # Copyright (c) 1997-2001 by Sun Microsystems, Inc.
 # All rights reserved.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
+
 #
 
 include ../Makefile.com
 
 all: $(LIBS)
 
-install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT)
+install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) $(ROOTCOMPATLINKS)
--- old/usr/src/lib/libsocket/sparcv9/Makefile	2019-07-05 17:33:49.967751433 +0000
+++ new/usr/src/lib/libsocket/sparcv9/Makefile	2019-07-05 17:33:49.983034602 +0000
@@ -23,7 +23,7 @@
 # Copyright 1997-2003 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
+
 #
 
 include ../Makefile.com
@@ -31,4 +31,4 @@
 
 all: $(LIBS)
 
-install: all $(ROOTLIBS64) $(ROOTLINKS64)
+install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64)
--- old/usr/src/lib/libsysevent/amd64/Makefile	2019-07-05 17:33:50.443433199 +0000
+++ new/usr/src/lib/libsysevent/amd64/Makefile	2019-07-05 17:33:50.459988582 +0000
@@ -23,7 +23,7 @@
 # Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
+
 #
 
 include ../Makefile.com
@@ -33,4 +33,4 @@
 
 all: $(LIBS)
 
-install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTLINT64)
+install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTLINT64) $(ROOTCOMPATLINKS64)
--- old/usr/src/lib/libsysevent/i386/Makefile	2019-07-05 17:33:50.904598515 +0000
+++ new/usr/src/lib/libsysevent/i386/Makefile	2019-07-05 17:33:50.921702299 +0000
@@ -23,7 +23,7 @@
 # Copyright 2000,2002-2003 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
+
 #
 # lib/libsysevent/i386/Makefile
 
@@ -33,4 +33,4 @@
 
 .KEEP_STATE:
 
-install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT)
+install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) $(ROOTCOMPATLINKS)
--- old/usr/src/lib/libsysevent/sparc/Makefile	2019-07-05 17:33:51.382269272 +0000
+++ new/usr/src/lib/libsysevent/sparc/Makefile	2019-07-05 17:33:51.400302539 +0000
@@ -23,7 +23,7 @@
 # Copyright 2000,2002-2003 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
+
 #
 # lib/libsysevent/sparc/Makefile
 
@@ -33,4 +33,4 @@
 
 all: $(LIBS)
 
-install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT)
+install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) $(ROOTCOMPATLINKS)
--- old/usr/src/lib/libsysevent/sparcv9/Makefile	2019-07-05 17:33:51.852514073 +0000
+++ new/usr/src/lib/libsysevent/sparcv9/Makefile	2019-07-05 17:33:51.869956489 +0000
@@ -23,7 +23,7 @@
 # Copyright 2000,2002-2003 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
+
 #
 # lib/libsysevent/sparcv9/Makefile
 
@@ -34,4 +34,4 @@
 
 all: $(LIBS)
 
-install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTLINT64)
+install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTLINT64) $(ROOTCOMPATLINKS64)
--- old/usr/src/lib/libtermcap/Makefile.com	2019-07-05 17:33:52.354706414 +0000
+++ new/usr/src/lib/libtermcap/Makefile.com	2019-07-05 17:33:52.372230555 +0000
@@ -13,11 +13,19 @@
 # Copyright 2011 Nexenta Systems, Inc.  All rights reserved.
 #
 
-# install this library in the root filesystem
-include ../../Makefile.rootfs
-
 LIBRARY =	libtermcap.a
 VERS =		.1
 LIBS +=		$(LINTLIB)
 
+# install this library in the root filesystem
+include ../../Makefile.rootfs
+
+COMPATLINKS +=	/usr/ccs/lib/libtermcap.so
+COMPATLINKS64 += /usr/ccs/lib/$(MACH64)/libtermcap.so
+
+$(ROOT)/usr/ccs/lib/libtermcap.so := \
+	COMPATLINKTARGET=../../../lib/libtermcap.so.1
+$(ROOT)/usr/ccs/lib/$(MACH64)/libtermcap.so := \
+	COMPATLINKTARGET=../../../../lib/$(MACH64)/libtermcap.so.1
+
 DYNFLAGS +=	$(ZLOADFLTR)
--- old/usr/src/lib/libtermcap/amd64/Makefile	2019-07-05 17:33:52.838776465 +0000
+++ new/usr/src/lib/libtermcap/amd64/Makefile	2019-07-05 17:33:52.857419911 +0000
@@ -14,9 +14,9 @@
 #
 
 include		$(SRC)/lib/Makefile.filter.com
-include		../Makefile.com
 include		$(SRC)/lib/Makefile.lib.64
+include		../Makefile.com
 
-install:	$(ROOTLIBS64) $(ROOTLINKS64)
+install:	$(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64)
 
 include		$(SRC)/lib/Makefile.filter.targ
--- old/usr/src/lib/libtermcap/i386/Makefile	2019-07-05 17:33:53.347123876 +0000
+++ new/usr/src/lib/libtermcap/i386/Makefile	2019-07-05 17:33:53.364973288 +0000
@@ -16,6 +16,6 @@
 include		$(SRC)/lib/Makefile.filter.com
 include		../Makefile.com
 
-install:	$(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT)
+install:	$(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) $(ROOTCOMPATLINKS)
 
 include		$(SRC)/lib/Makefile.filter.targ
--- old/usr/src/lib/libtermcap/sparc/Makefile	2019-07-05 17:33:53.832565342 +0000
+++ new/usr/src/lib/libtermcap/sparc/Makefile	2019-07-05 17:33:53.849843813 +0000
@@ -16,6 +16,6 @@
 include		$(SRC)/lib/Makefile.filter.com
 include		../Makefile.com
 
-install:	$(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT)
+install:	$(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) $(ROOTCOMPATLINKS)
 
 include		$(SRC)/lib/Makefile.filter.targ
--- old/usr/src/lib/libtermcap/sparcv9/Makefile	2019-07-05 17:33:54.388104901 +0000
+++ new/usr/src/lib/libtermcap/sparcv9/Makefile	2019-07-05 17:33:54.406481658 +0000
@@ -14,9 +14,9 @@
 #
 
 include		$(SRC)/lib/Makefile.filter.com
-include		../Makefile.com
 include		$(SRC)/lib/Makefile.lib.64
+include		../Makefile.com
 
-install:	$(ROOTLIBS64) $(ROOTLINKS64)
+install:	$(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64)
 
 include		$(SRC)/lib/Makefile.filter.targ
--- old/usr/src/lib/libthread/Makefile.com	2019-07-05 17:33:54.899241352 +0000
+++ new/usr/src/lib/libthread/Makefile.com	2019-07-05 17:33:54.916773265 +0000
@@ -29,3 +29,33 @@
 
 LIBS +=		$(LINTLIB)
 DYNFLAGS +=	-F libc.so.1
+
+COMPATLINKS +=	/usr/lib/lwp/libthread.so.1 \
+		/usr/lib/lwp/libthread_db.so.1 \
+		/usr/lib/lwp/$(MACH64)/libthread.so.1 \
+		/usr/lib/lwp/$(MACH64)/libthread_db.so.1 \
+		/lib/libthread_db.so.1 \
+		/lib/libthread_db.so \
+		/usr/lib/libthread_db.so.1 \
+		/usr/lib/libthread_db.so \
+		/lib/$(MACH64)/libthread_db.so.1 \
+		/lib/$(MACH64)/libthread_db.so \
+		/usr/lib/$(MACH64)/libthread_db.so.1 \
+		/usr/lib/$(MACH64)/libthread_db.so
+
+$(ROOT)/usr/lib/lwp/libthread.so.1 := COMPATLINKTARGET=../libthread.so.1
+$(ROOT)/usr/lib/lwp/libthread_db.so.1 := COMPATLINKTARGET=../libthread_db.so.1
+$(ROOT)/usr/lib/lwp/$(MACH64)/libthread.so.1:= \
+	COMPATLINKTARGET=../../$(MACH64)/libthread.so.1
+$(ROOT)/usr/lib/lwp/$(MACH64)/libthread_db.so.1:= \
+	COMPATLINKTARGET=../../$(MACH64)/libthread_db.so.1
+$(ROOT)/lib/libthread_db.so.1 := COMPATLINKTARGET=libc_db.so.1
+$(ROOT)/lib/libthread_db.so := COMPATLINKTARGET=libc_db.so.1
+$(ROOT)/usr/lib/libthread_db.so.1 := COMPATLINKTARGET=../../lib/libc_db.so.1
+$(ROOT)/usr/lib/libthread_db.so := COMPATLINKTARGET=../../lib/libc_db.so.1
+$(ROOT)/lib/$(MACH64)/libthread_db.so.1 := COMPATLINKTARGET=libc_db.so.1
+$(ROOT)/lib/$(MACH64)/libthread_db.so := COMPATLINKTARGET=libc_db.so.1
+$(ROOT)/usr/lib/$(MACH64)/libthread_db.so.1:= \
+	COMPATLINKTARGET=../../../lib/$(MACH64)/libc_db.so.1
+$(ROOT)/usr/lib/$(MACH64)/libthread_db.so:= \
+	COMPATLINKTARGET=../../../lib/$(MACH64)/libc_db.so.1
--- old/usr/src/lib/libthread/amd64/Makefile	2019-07-05 17:33:55.422226612 +0000
+++ new/usr/src/lib/libthread/amd64/Makefile	2019-07-05 17:33:55.444391409 +0000
@@ -27,6 +27,7 @@
 include		../Makefile.com
 include		$(SRC)/lib/Makefile.lib.64
 
-install:	all $(ROOTLIBDIR64) .WAIT $(ROOTLIBS64) $(ROOTLINKS64)
+install:	all $(ROOTLIBDIR64) .WAIT $(ROOTLIBS64) $(ROOTLINKS64) \
+	$(ROOTCOMPATLINKS64)
 
 include		$(SRC)/lib/Makefile.filter.targ
--- old/usr/src/lib/libthread/i386/Makefile	2019-07-05 17:33:55.953668487 +0000
+++ new/usr/src/lib/libthread/i386/Makefile	2019-07-05 17:33:55.970470707 +0000
@@ -26,6 +26,7 @@
 include		$(SRC)/lib/Makefile.filter.com
 include		../Makefile.com
 
-install:	all $(ROOTLIBDIR) .WAIT $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT)
+install:	all $(ROOTLIBDIR) .WAIT $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) \
+	$(ROOTCOMPATLINKS)
 
 include		$(SRC)/lib/Makefile.filter.targ
--- old/usr/src/lib/libthread/sparc/Makefile	2019-07-05 17:33:56.452435413 +0000
+++ new/usr/src/lib/libthread/sparc/Makefile	2019-07-05 17:33:56.470073839 +0000
@@ -26,6 +26,7 @@
 include		$(SRC)/lib/Makefile.filter.com
 include		../Makefile.com
 
-install:	all $(ROOTLIBDIR) .WAIT $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT)
+install:	all $(ROOTLIBDIR) .WAIT $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) \
+	$(ROOTCOMPATLINKS)
 
 include		$(SRC)/lib/Makefile.filter.targ
--- old/usr/src/lib/libthread/sparcv9/Makefile	2019-07-05 17:33:56.930360199 +0000
+++ new/usr/src/lib/libthread/sparcv9/Makefile	2019-07-05 17:33:56.948177372 +0000
@@ -27,6 +27,7 @@
 include		../Makefile.com
 include		$(SRC)/lib/Makefile.lib.64
 
-install:	all $(ROOTLIBDIR64) .WAIT $(ROOTLIBS64) $(ROOTLINKS64)
+install:	all $(ROOTLIBDIR64) .WAIT $(ROOTLIBS64) $(ROOTLINKS64) \
+	$(ROOTCOMPATLINKS64)
 
 include		$(SRC)/lib/Makefile.filter.targ
--- old/usr/src/lib/libtsnet/amd64/Makefile	2019-07-05 17:33:57.434785515 +0000
+++ new/usr/src/lib/libtsnet/amd64/Makefile	2019-07-05 17:33:57.452232921 +0000
@@ -23,9 +23,9 @@
 # Use is subject to license terms.
 #
 
-#ident	"%Z%%M%	%I%	%E% SMI"
+
 
 include ../Makefile.com
 include ../../Makefile.lib.64
 
-install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTLINT64)
+install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTLINT64) $(ROOTCOMPATLINKS64)
--- old/usr/src/lib/libtsnet/i386/Makefile	2019-07-05 17:33:57.907525296 +0000
+++ new/usr/src/lib/libtsnet/i386/Makefile	2019-07-05 17:33:57.924003676 +0000
@@ -22,7 +22,7 @@
 # Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
+
 #
 
 include ../Makefile.com
@@ -31,4 +31,4 @@
 
 all: $(LIBS)
 
-install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT)
+install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) $(ROOTCOMPATLINKS)
--- old/usr/src/lib/libtsnet/sparc/Makefile	2019-07-05 17:33:58.396535228 +0000
+++ new/usr/src/lib/libtsnet/sparc/Makefile	2019-07-05 17:33:58.414246735 +0000
@@ -22,11 +22,11 @@
 # Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
+
 #
 
 include ../Makefile.com
 
 all: $(LIBS)
 
-install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT)
+install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) $(ROOTCOMPATLINKS)
--- old/usr/src/lib/libtsnet/sparcv9/Makefile	2019-07-05 17:33:58.885415624 +0000
+++ new/usr/src/lib/libtsnet/sparcv9/Makefile	2019-07-05 17:33:58.902722860 +0000
@@ -23,9 +23,9 @@
 # Use is subject to license terms.
 #
 
-#ident	"%Z%%M%	%I%	%E% SMI"
+
 
 include ../Makefile.com
 include ../../Makefile.lib.64
 
-install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTLINT64)
+install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTLINT64) $(ROOTCOMPATLINKS64)
--- old/usr/src/lib/libtsol/amd64/Makefile	2019-07-05 17:33:59.371678904 +0000
+++ new/usr/src/lib/libtsol/amd64/Makefile	2019-07-05 17:33:59.388331617 +0000
@@ -23,9 +23,9 @@
 # Use is subject to license terms.
 #
 
-#ident	"%Z%%M%	%I%	%E% SMI"
+
 
 include ../Makefile.com
 include ../../Makefile.lib.64
 
-install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTLINT64)
+install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTLINT64) $(ROOTCOMPATLINKS64)
--- old/usr/src/lib/libtsol/i386/Makefile	2019-07-05 17:33:59.840440283 +0000
+++ new/usr/src/lib/libtsol/i386/Makefile	2019-07-05 17:33:59.856780570 +0000
@@ -23,8 +23,8 @@
 # Use is subject to license terms.
 #/
 
-#ident	"%Z%%M%	%I%	%E% SMI"
+
 
 include ../Makefile.com
 
-install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT)
+install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) $(ROOTCOMPATLINKS)
--- old/usr/src/lib/libtsol/sparc/Makefile	2019-07-05 17:34:00.323095991 +0000
+++ new/usr/src/lib/libtsol/sparc/Makefile	2019-07-05 17:34:00.340523605 +0000
@@ -23,8 +23,8 @@
 # Use is subject to license terms.
 #
 
-#ident	"%Z%%M%	%I%	%E% SMI"
+
 
 include ../Makefile.com
 
-install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT)
+install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) $(ROOTCOMPATLINKS)
--- old/usr/src/lib/libtsol/sparcv9/Makefile	2019-07-05 17:34:00.768799827 +0000
+++ new/usr/src/lib/libtsol/sparcv9/Makefile	2019-07-05 17:34:00.778607175 +0000
@@ -23,9 +23,9 @@
 # Use is subject to license terms.
 #
 
-#ident	"%Z%%M%	%I%	%E% SMI"
+
 
 include ../Makefile.com
 include ../../Makefile.lib.64
 
-install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTLINT64)
+install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTLINT64) $(ROOTCOMPATLINKS64)
--- old/usr/src/lib/libumem/Makefile.com	2019-07-05 17:34:01.236968028 +0000
+++ new/usr/src/lib/libumem/Makefile.com	2019-07-05 17:34:01.255118301 +0000
@@ -157,7 +157,7 @@
 CFLAGS64_standalone = $(STAND_FLAGS_64)
 CFLAGS64 += $(CCVERBOSE) $(CFLAGS64_$(CURTYPE)) $(CFLAGS64_common)
 
-INSTALL_DEPS_library =		$(ROOTLINKS) $(ROOTLINT) $(ROOTLIBS)
+INSTALL_DEPS_library =	$(ROOTLINKS) $(ROOTLINT) $(ROOTLIBS) $(ROOTCOMPATLINKS)
 
 #
 # turn off ptr-cast warnings, since we do them all the time
--- old/usr/src/lib/libumem/amd64/Makefile	2019-07-05 17:34:01.727229863 +0000
+++ new/usr/src/lib/libumem/amd64/Makefile	2019-07-05 17:34:01.744680872 +0000
@@ -23,7 +23,7 @@
 # Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
+
 #
 
 ISASRCDIR=../$(MACH)/
@@ -33,6 +33,7 @@
 
 TYPES=library standalone
 
-INSTALL_DEPS_library = $(ROOTLINKS64) $(ROOTLINT64) $(ROOTLIBS64)
+INSTALL_DEPS_library = $(ROOTLINKS64) $(ROOTLINT64) $(ROOTLIBS64) \
+	$(ROOTCOMPATLINKS64)
 
 include ../Makefile.targ
--- old/usr/src/lib/libumem/sparcv9/Makefile	2019-07-05 17:34:02.227966679 +0000
+++ new/usr/src/lib/libumem/sparcv9/Makefile	2019-07-05 17:34:02.245154562 +0000
@@ -23,7 +23,7 @@
 # Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
+
 #
 
 ISASRCDIR=../sparc
@@ -33,6 +33,7 @@
 
 TYPES=library standalone
 
-INSTALL_DEPS_library = $(ROOTLINKS64) $(ROOTLINT64) $(ROOTLIBS64)
+INSTALL_DEPS_library = $(ROOTLINKS64) $(ROOTLINT64) $(ROOTLIBS64) \
+	$(ROOTCOMPATLINKS64)
 
 include ../Makefile.targ
--- old/usr/src/lib/libuuid/amd64/Makefile	2019-07-05 17:34:02.699055721 +0000
+++ new/usr/src/lib/libuuid/amd64/Makefile	2019-07-05 17:34:02.715320473 +0000
@@ -23,7 +23,7 @@
 # Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
+
 #
 
 include ../Makefile.com
@@ -33,4 +33,4 @@
 
 all: $(LIBS)
 
-install: all $(ROOTLIBS64) $(ROOTLINKS64)
+install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64)
--- old/usr/src/lib/libuuid/i386/Makefile	2019-07-05 17:34:03.140451190 +0000
+++ new/usr/src/lib/libuuid/i386/Makefile	2019-07-05 17:34:03.156803313 +0000
@@ -23,11 +23,11 @@
 # Copyright 2002 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
+
 #
 
 include ../Makefile.com
 
 all: $(LIBS)
 
-install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT)
+install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) $(ROOTCOMPATLINKS)
--- old/usr/src/lib/libuuid/sparc/Makefile	2019-07-05 17:34:03.598408424 +0000
+++ new/usr/src/lib/libuuid/sparc/Makefile	2019-07-05 17:34:03.616053840 +0000
@@ -23,11 +23,11 @@
 # Copyright 2002 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
+
 #
 
 include ../Makefile.com
 
 all: $(LIBS)
 
-install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT)
+install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) $(ROOTCOMPATLINKS)
--- old/usr/src/lib/libuuid/sparcv9/Makefile	2019-07-05 17:34:04.062772941 +0000
+++ new/usr/src/lib/libuuid/sparcv9/Makefile	2019-07-05 17:34:04.077657149 +0000
@@ -23,7 +23,7 @@
 # Copyright 2002 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
+
 #
 
 include ../Makefile.com
@@ -33,4 +33,4 @@
 
 all: $(LIBS)
 
-install: all $(ROOTLIBS64) $(ROOTLINKS64)
+install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64)
--- old/usr/src/lib/libuutil/amd64/Makefile	2019-07-05 17:34:04.529591340 +0000
+++ new/usr/src/lib/libuutil/amd64/Makefile	2019-07-05 17:34:04.545805227 +0000
@@ -23,10 +23,10 @@
 # Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
+
 #
 
 include ../Makefile.com
 include ../../Makefile.lib.64
 
-install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTLINT)
+install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTLINT) $(ROOTCOMPATLINKS64)
--- old/usr/src/lib/libuutil/i386/Makefile	2019-07-05 17:34:04.973160375 +0000
+++ new/usr/src/lib/libuutil/i386/Makefile	2019-07-05 17:34:04.985451526 +0000
@@ -23,9 +23,9 @@
 # Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
+
 #
 
 include ../Makefile.com
 
-install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT)
+install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) $(ROOTCOMPATLINKS)
--- old/usr/src/lib/libuutil/sparc/Makefile	2019-07-05 17:34:05.345787354 +0000
+++ new/usr/src/lib/libuutil/sparc/Makefile	2019-07-05 17:34:05.362126731 +0000
@@ -23,9 +23,9 @@
 # Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
+
 #
 
 include ../Makefile.com
 
-install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT)
+install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) $(ROOTCOMPATLINKS)
--- old/usr/src/lib/libuutil/sparcv9/Makefile	2019-07-05 17:34:05.794638219 +0000
+++ new/usr/src/lib/libuutil/sparcv9/Makefile	2019-07-05 17:34:05.812054560 +0000
@@ -23,7 +23,7 @@
 # Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
+
 #
 
 include ../Makefile.com
@@ -35,4 +35,4 @@
 
 all: $(LIBS)
 
-install: all $(ROOTLIBS64) $(ROOTLINKS64)
+install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64)
--- old/usr/src/lib/libvrrpadm/amd64/Makefile	2019-07-05 17:34:06.271631381 +0000
+++ new/usr/src/lib/libvrrpadm/amd64/Makefile	2019-07-05 17:34:06.288911402 +0000
@@ -26,4 +26,4 @@
 include ../Makefile.com
 include ../../Makefile.lib.64
 
-install: all $(ROOTLIBS64) $(ROOTLINKS64)
+install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64)
--- old/usr/src/lib/libvrrpadm/i386/Makefile	2019-07-05 17:34:06.747106949 +0000
+++ new/usr/src/lib/libvrrpadm/i386/Makefile	2019-07-05 17:34:06.764864304 +0000
@@ -25,4 +25,4 @@
 
 include ../Makefile.com
 
-install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT)
+install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) $(ROOTCOMPATLINKS)
--- old/usr/src/lib/libvrrpadm/sparc/Makefile	2019-07-05 17:34:07.253874295 +0000
+++ new/usr/src/lib/libvrrpadm/sparc/Makefile	2019-07-05 17:34:07.270943664 +0000
@@ -25,4 +25,4 @@
 
 include ../Makefile.com
 
-install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT)
+install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) $(ROOTCOMPATLINKS)
--- old/usr/src/lib/libvrrpadm/sparcv9/Makefile	2019-07-05 17:34:07.739770239 +0000
+++ new/usr/src/lib/libvrrpadm/sparcv9/Makefile	2019-07-05 17:34:07.762569678 +0000
@@ -26,4 +26,4 @@
 include ../Makefile.com
 include ../../Makefile.lib.64
 
-install: all $(ROOTLIBS64) $(ROOTLINKS64)
+install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64)
--- old/usr/src/lib/libw/amd64/Makefile	2019-07-05 17:34:08.262707473 +0000
+++ new/usr/src/lib/libw/amd64/Makefile	2019-07-05 17:34:08.279711015 +0000
@@ -27,6 +27,7 @@
 include		../Makefile.com
 include		$(SRC)/lib/Makefile.lib.64
 
-install:	all $(ROOTLIBDIR64) .WAIT $(ROOTLIBS64) $(ROOTLINKS64)
+install:	all $(ROOTLIBDIR64) .WAIT $(ROOTLIBS64) $(ROOTLINKS64) \
+	$(ROOTCOMPATLINKS64)
 
 include		$(SRC)/lib/Makefile.filter.targ
--- old/usr/src/lib/libw/i386/Makefile	2019-07-05 17:34:08.762339540 +0000
+++ new/usr/src/lib/libw/i386/Makefile	2019-07-05 17:34:08.779415134 +0000
@@ -26,6 +26,6 @@
 include		$(SRC)/lib/Makefile.filter.com
 include		../Makefile.com
 
-install:	all $(ROOTLIBDIR) .WAIT $(ROOTLIBS) $(ROOTLINKS)
+install:	all $(ROOTLIBDIR) .WAIT $(ROOTLIBS) $(ROOTLINKS) $(ROOTCOMPATLINKS)
 
 include		$(SRC)/lib/Makefile.filter.targ
--- old/usr/src/lib/libw/sparc/Makefile	2019-07-05 17:34:09.261048499 +0000
+++ new/usr/src/lib/libw/sparc/Makefile	2019-07-05 17:34:09.277470809 +0000
@@ -26,6 +26,6 @@
 include		$(SRC)/lib/Makefile.filter.com
 include		../Makefile.com
 
-install:	all $(ROOTLIBDIR) .WAIT $(ROOTLIBS) $(ROOTLINKS)
+install:	all $(ROOTLIBDIR) .WAIT $(ROOTLIBS) $(ROOTLINKS) $(ROOTCOMPATLINKS)
 
 include		$(SRC)/lib/Makefile.filter.targ
--- old/usr/src/lib/libw/sparcv9/Makefile	2019-07-05 17:34:09.739860757 +0000
+++ new/usr/src/lib/libw/sparcv9/Makefile	2019-07-05 17:34:09.757914851 +0000
@@ -27,6 +27,7 @@
 include		../Makefile.com
 include		$(SRC)/lib/Makefile.lib.64
 
-install:	all $(ROOTLIBDIR64) .WAIT $(ROOTLIBS64) $(ROOTLINKS64)
+install:	all $(ROOTLIBDIR64) .WAIT $(ROOTLIBS64) $(ROOTLINKS64) \
+	$(ROOTCOMPATLINKS64)
 
 include		$(SRC)/lib/Makefile.filter.targ
--- old/usr/src/lib/libxnet/amd64/Makefile	2019-07-05 17:34:10.246050630 +0000
+++ new/usr/src/lib/libxnet/amd64/Makefile	2019-07-05 17:34:10.264169153 +0000
@@ -27,6 +27,7 @@
 include		../Makefile.com
 include		$(SRC)/lib/Makefile.lib.64
 
-install:	all $(ROOTLIBDIR64) .WAIT $(ROOTLIBS64) $(ROOTLINKS64)
+install:	all $(ROOTLIBDIR64) .WAIT $(ROOTLIBS64) $(ROOTLINKS64) \
+	$(ROOTCOMPATLINKS64)
 
 include		$(SRC)/lib/Makefile.filter.targ
--- old/usr/src/lib/libxnet/i386/Makefile	2019-07-05 17:34:10.724936314 +0000
+++ new/usr/src/lib/libxnet/i386/Makefile	2019-07-05 17:34:10.742995551 +0000
@@ -26,6 +26,7 @@
 include		$(SRC)/lib/Makefile.filter.com
 include		../Makefile.com
 
-install:	all $(ROOTLIBDIR) .WAIT $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT)
+install:	all $(ROOTLIBDIR) .WAIT $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) \
+	$(ROOTCOMPATLINKS)
 
 include		$(SRC)/lib/Makefile.filter.targ
--- old/usr/src/lib/libxnet/sparc/Makefile	2019-07-05 17:34:11.227421975 +0000
+++ new/usr/src/lib/libxnet/sparc/Makefile	2019-07-05 17:34:11.245354789 +0000
@@ -26,6 +26,7 @@
 include		$(SRC)/lib/Makefile.filter.com
 include		../Makefile.com
 
-install:	all $(ROOTLIBDIR) .WAIT $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT)
+install:	all $(ROOTLIBDIR) .WAIT $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) \
+	$(ROOTCOMPATLINKS)
 
 include		$(SRC)/lib/Makefile.filter.targ
--- old/usr/src/lib/libxnet/sparcv9/Makefile	2019-07-05 17:34:11.723281513 +0000
+++ new/usr/src/lib/libxnet/sparcv9/Makefile	2019-07-05 17:34:11.741447298 +0000
@@ -27,6 +27,7 @@
 include		../Makefile.com
 include		$(SRC)/lib/Makefile.lib.64
 
-install:	all $(ROOTLIBDIR64) .WAIT $(ROOTLIBS64) $(ROOTLINKS64)
+install:	all $(ROOTLIBDIR64) .WAIT $(ROOTLIBS64) $(ROOTLINKS64) \
+	$(ROOTCOMPATLINKS64)
 
 include		$(SRC)/lib/Makefile.filter.targ
--- old/usr/src/lib/libzfs/amd64/Makefile	2019-07-05 17:34:12.244251002 +0000
+++ new/usr/src/lib/libzfs/amd64/Makefile	2019-07-05 17:34:12.261519861 +0000
@@ -23,9 +23,9 @@
 # Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
+
 
 include ../Makefile.com
 include ../../Makefile.lib.64
 
-install: all $(ROOTLIBS64) $(ROOTLINKS64)
+install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64)
--- old/usr/src/lib/libzfs/i386/Makefile	2019-07-05 17:34:12.726537358 +0000
+++ new/usr/src/lib/libzfs/i386/Makefile	2019-07-05 17:34:12.746797811 +0000
@@ -23,8 +23,8 @@
 # Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
+
 
 include ../Makefile.com
 
-install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT)
+install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) $(ROOTCOMPATLINKS)
--- old/usr/src/lib/libzfs/sparc/Makefile	2019-07-05 17:34:13.213150878 +0000
+++ new/usr/src/lib/libzfs/sparc/Makefile	2019-07-05 17:34:13.229579742 +0000
@@ -23,8 +23,8 @@
 # Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
+
 
 include ../Makefile.com
 
-install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT)
+install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) $(ROOTCOMPATLINKS)
--- old/usr/src/lib/libzfs/sparcv9/Makefile	2019-07-05 17:34:13.665633260 +0000
+++ new/usr/src/lib/libzfs/sparcv9/Makefile	2019-07-05 17:34:13.682584085 +0000
@@ -29,4 +29,4 @@
 
 sparcv9_C_PICFLAGS= $(sparcv9_C_BIGPICFLAGS)
 
-install: all $(ROOTLIBS64) $(ROOTLINKS64)
+install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64)
--- old/usr/src/lib/libzfs_core/amd64/Makefile	2019-07-05 17:34:14.156404309 +0000
+++ new/usr/src/lib/libzfs_core/amd64/Makefile	2019-07-05 17:34:14.175170962 +0000
@@ -27,4 +27,4 @@
 include ../Makefile.com
 include ../../Makefile.lib.64
 
-install: all $(ROOTLIBS64) $(ROOTLINKS64)
+install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64)
--- old/usr/src/lib/libzfs_core/i386/Makefile	2019-07-05 17:34:14.688520205 +0000
+++ new/usr/src/lib/libzfs_core/i386/Makefile	2019-07-05 17:34:14.707168224 +0000
@@ -26,4 +26,4 @@
 
 include ../Makefile.com
 
-install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT)
+install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) $(ROOTCOMPATLINKS)
--- old/usr/src/lib/libzfs_core/sparc/Makefile	2019-07-05 17:34:15.175553446 +0000
+++ new/usr/src/lib/libzfs_core/sparc/Makefile	2019-07-05 17:34:15.192842162 +0000
@@ -26,4 +26,4 @@
 
 include ../Makefile.com
 
-install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT)
+install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) $(ROOTCOMPATLINKS)
--- old/usr/src/lib/libzfs_core/sparcv9/Makefile	2019-07-05 17:34:15.645035281 +0000
+++ new/usr/src/lib/libzfs_core/sparcv9/Makefile	2019-07-05 17:34:15.663574995 +0000
@@ -29,4 +29,4 @@
 
 sparcv9_C_PICFLAGS= $(sparcv9_C_BIGPICFLAGS)
 
-install: all $(ROOTLIBS64) $(ROOTLINKS64)
+install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64)
--- old/usr/src/lib/nsswitch/compat/Makefile.com	2019-07-05 17:34:16.126375896 +0000
+++ new/usr/src/lib/nsswitch/compat/Makefile.com	2019-07-05 17:34:16.143374995 +0000
@@ -23,9 +23,6 @@
 # Copyright 1993,2001-2003 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
-#
-# lib/nsswitch/compat/Makefile.com
 
 LIBRARY =	libnss_compat.a
 VERS =		.1
@@ -43,5 +40,14 @@
 # install this library in the root filesystem
 include ../../../Makefile.rootfs
 
-LDLIBS +=	-lnsl
 DYNLIB1 =	nss_compat.so$(VERS)
+
+COMPATLINKS=	/usr/lib/$(DYNLIB1)
+COMPATLINKS64=	/usr/lib/$(MACH64)/$(DYNLIB1)
+
+$(ROOT)/usr/lib/$(DYNLIB1) := COMPATLINKTARGET=../../lib/$(DYNLIB1)
+$(ROOT)/usr/lib/$(MACH64)/$(DYNLIB1):= \
+	COMPATLINKTARGET=../../../lib/$(MACH64)/$(DYNLIB1)
+
+LDLIBS +=	-lnsl
+
--- old/usr/src/lib/nsswitch/compat/amd64/Makefile	2019-07-05 17:34:16.606556402 +0000
+++ new/usr/src/lib/nsswitch/compat/amd64/Makefile	2019-07-05 17:34:16.623817468 +0000
@@ -23,7 +23,7 @@
 # Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
+
 #
 
 include		../Makefile.com
@@ -33,4 +33,4 @@
 
 include		../../Makefile.targ
 
-install:	all $(ROOT64DYNLIB)
+install:	all $(ROOT64DYNLIB) $(ROOTCOMPATLINKS64)
--- old/usr/src/lib/nsswitch/compat/i386/Makefile	2019-07-05 17:34:17.089620112 +0000
+++ new/usr/src/lib/nsswitch/compat/i386/Makefile	2019-07-05 17:34:17.105192810 +0000
@@ -23,7 +23,7 @@
 # Copyright 1993,2001-2003 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
+
 #
 # lib/nsswitch/compat/i386/Makefile
 
@@ -33,4 +33,4 @@
 
 include		../../Makefile.targ
 
-install:	all $(ROOTLIBS)
+install:	all $(ROOTLIBS) $(ROOTCOMPATLINKS)
--- old/usr/src/lib/nsswitch/compat/sparc/Makefile	2019-07-05 17:34:17.546630598 +0000
+++ new/usr/src/lib/nsswitch/compat/sparc/Makefile	2019-07-05 17:34:17.563162344 +0000
@@ -23,7 +23,7 @@
 # Copyright 1993,2001-2003 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
+
 #
 # lib/nsswitch/compat/sparc/Makefile
 
@@ -33,4 +33,4 @@
 
 include		../../Makefile.targ
 
-install:	all $(ROOTLIBS)
+install:	all $(ROOTLIBS) $(ROOTCOMPATLINKS)
--- old/usr/src/lib/nsswitch/compat/sparcv9/Makefile	2019-07-05 17:34:18.021668128 +0000
+++ new/usr/src/lib/nsswitch/compat/sparcv9/Makefile	2019-07-05 17:34:18.039766409 +0000
@@ -20,7 +20,7 @@
 # CDDL HEADER END
 #
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
+
 #
 # Copyright (c) 1993,2001 by Sun Microsystems, Inc.
 # All rights reserved.
@@ -34,4 +34,4 @@
 
 include		../../Makefile.targ
 
-install:	all $(ROOT64DYNLIB)
+install:	all $(ROOT64DYNLIB) $(ROOTCOMPATLINKS64)
--- old/usr/src/lib/nsswitch/dns/Makefile.com	2019-07-05 17:34:18.518259194 +0000
+++ new/usr/src/lib/nsswitch/dns/Makefile.com	2019-07-05 17:34:18.536048431 +0000
@@ -38,6 +38,15 @@
 # install this library in the root filesystem
 include ../../../Makefile.rootfs
 
+DYNLIB1 =	nss_dns.so$(VERS)
+
+COMPATLINKS=	/usr/lib/$(DYNLIB1)
+COMPATLINKS64=	/usr/lib/$(MACH64)/$(DYNLIB1)
+
+$(ROOT)/usr/lib/$(DYNLIB1) := COMPATLINKTARGET=../../lib/$(DYNLIB1)
+$(ROOT)/usr/lib/$(MACH64)/$(DYNLIB1):= \
+	COMPATLINKTARGET=../../../lib/$(MACH64)/$(DYNLIB1)
+
 # Appropriate libresolv loaded at runtime. This is the default, to be dlopened
 # if no libresolv was provided by the application.
 CPPFLAGS +=	-DNSS_DNS_LIBRESOLV=\"libresolv.so.2\"
@@ -45,4 +54,4 @@
 LINTFLAGS +=	-erroff=E_GLOBAL_COULD_BE_STATIC2
 
 LDLIBS +=	-lnsl -lsocket
-DYNLIB1 =	nss_dns.so$(VERS)
+
--- old/usr/src/lib/nsswitch/dns/amd64/Makefile	2019-07-05 17:34:19.005848493 +0000
+++ new/usr/src/lib/nsswitch/dns/amd64/Makefile	2019-07-05 17:34:19.025174471 +0000
@@ -23,7 +23,7 @@
 # Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
+
 #
 
 include		../Makefile.com
@@ -33,4 +33,4 @@
 
 include		../../Makefile.targ
 
-install:	all $(ROOT64DYNLIB)
+install:	all $(ROOT64DYNLIB) $(ROOTCOMPATLINKS64)
--- old/usr/src/lib/nsswitch/dns/i386/Makefile	2019-07-05 17:34:19.497599183 +0000
+++ new/usr/src/lib/nsswitch/dns/i386/Makefile	2019-07-05 17:34:19.515110493 +0000
@@ -23,7 +23,7 @@
 # Copyright 1993,2001-2003 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
+
 #
 # lib/nsswitch/dns/i386/Makefile
 
@@ -33,4 +33,4 @@
 
 include		../../Makefile.targ
 
-install:	all $(ROOTLIBS)
+install:	all $(ROOTLIBS) $(ROOTCOMPATLINKS)
--- old/usr/src/lib/nsswitch/dns/sparc/Makefile	2019-07-05 17:34:19.994003646 +0000
+++ new/usr/src/lib/nsswitch/dns/sparc/Makefile	2019-07-05 17:34:20.013157342 +0000
@@ -23,7 +23,7 @@
 # Copyright 1993,2001-2003 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
+
 #
 # lib/nsswitch/dns/sparc/Makefile
 
@@ -33,4 +33,4 @@
 
 include		../../Makefile.targ
 
-install:	all $(ROOTLIBS)
+install:	all $(ROOTLIBS) $(ROOTCOMPATLINKS)
--- old/usr/src/lib/nsswitch/dns/sparcv9/Makefile	2019-07-05 17:34:20.467728948 +0000
+++ new/usr/src/lib/nsswitch/dns/sparcv9/Makefile	2019-07-05 17:34:20.486394432 +0000
@@ -20,7 +20,7 @@
 # CDDL HEADER END
 #
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
+
 #
 # Copyright (c) 1993,2001 by Sun Microsystems, Inc.
 # All rights reserved.
@@ -34,4 +34,4 @@
 
 include		../../Makefile.targ
 
-install:	all $(ROOT64DYNLIB)
+install:	all $(ROOT64DYNLIB) $(ROOTCOMPATLINKS64)
--- old/usr/src/lib/nsswitch/files/Makefile.com	2019-07-05 17:34:20.957102661 +0000
+++ new/usr/src/lib/nsswitch/files/Makefile.com	2019-07-05 17:34:20.974306969 +0000
@@ -62,4 +62,17 @@
 LDLIBS +=	-lnsl
 DYNLIB1 =	nss_files.so$(VERS)
 
+COMPATLINKS=	/usr/lib/$(DYNLIB1) /etc/lib/$(DYNLIB1)
+COMPATLINKS64=	/usr/lib/$(MACH64)/$(DYNLIB1)
+
+$(ROOT)/usr/lib/$(DYNLIB1) := COMPATLINKTARGET=../../lib/$(DYNLIB1)
+$(ROOT)/usr/lib/$(MACH64)/$(DYNLIB1):= \
+	COMPATLINKTARGET=../../../lib/$(MACH64)/$(DYNLIB1)
+$(ROOT)/usr/lib/$(DYNLIB1) := COMPATLINKTARGET=../../lib/$(DYNLIB1)
+$(ROOT)/usr/lib/$(MACH64)/$(DYNLIB1):= \
+	COMPATLINKTARGET=../../../lib/$(MACH64)/$(DYNLIB1)
+
+$(ROOT)/etc/lib/$(DYNLIB1) := COMPATLINKTARGET= ../../lib/$(DYNLIB1)
+
 all: $(DYNLIB1)
+
--- old/usr/src/lib/nsswitch/files/amd64/Makefile	2019-07-05 17:34:21.448188662 +0000
+++ new/usr/src/lib/nsswitch/files/amd64/Makefile	2019-07-05 17:34:21.466344342 +0000
@@ -23,7 +23,7 @@
 # Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
+
 #
 
 include		../Makefile.com
@@ -33,4 +33,4 @@
 
 include		../../Makefile.targ
 
-install:	all $(ROOT64DYNLIB)
+install:	all $(ROOT64DYNLIB) $(ROOTCOMPATLINKS64)
--- old/usr/src/lib/nsswitch/files/i386/Makefile	2019-07-05 17:34:21.921382638 +0000
+++ new/usr/src/lib/nsswitch/files/i386/Makefile	2019-07-05 17:34:21.938000862 +0000
@@ -23,7 +23,7 @@
 # Copyright 1993,2001-2003 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
+
 #
 # lib/nsswitch/files/i386/Makefile
 
@@ -33,4 +33,4 @@
 
 include		../../Makefile.targ
 
-install:	all $(ROOTLIBS)
+install:	all $(ROOTLIBS) $(ROOTCOMPATLINKS)
--- old/usr/src/lib/nsswitch/files/sparc/Makefile	2019-07-05 17:34:22.412146919 +0000
+++ new/usr/src/lib/nsswitch/files/sparc/Makefile	2019-07-05 17:34:22.429530834 +0000
@@ -23,7 +23,7 @@
 # Copyright 1993,2001-2003 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
+
 #
 # lib/nsswitch/files/sparc/Makefile
 
@@ -33,4 +33,4 @@
 
 include		../../Makefile.targ
 
-install:	all $(ROOTLIBS)
+install:	all $(ROOTLIBS) $(ROOTCOMPATLINKS)
--- old/usr/src/lib/nsswitch/files/sparcv9/Makefile	2019-07-05 17:34:22.912367959 +0000
+++ new/usr/src/lib/nsswitch/files/sparcv9/Makefile	2019-07-05 17:34:22.929743933 +0000
@@ -20,7 +20,7 @@
 # CDDL HEADER END
 #
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
+
 #
 # Copyright (c) 1993,2001 by Sun Microsystems, Inc.
 # All rights reserved.
@@ -34,4 +34,4 @@
 
 include		../../Makefile.targ
 
-install:	all $(ROOT64DYNLIB)
+install:	all $(ROOT64DYNLIB) $(ROOTCOMPATLINKS64)
--- old/usr/src/lib/nsswitch/nis/Makefile.com	2019-07-05 17:34:23.401713700 +0000
+++ new/usr/src/lib/nsswitch/nis/Makefile.com	2019-07-05 17:34:23.418542387 +0000
@@ -54,8 +54,17 @@
 # install this library in the root filesystem
 include ../../../Makefile.rootfs
 
+DYNLIB1 =	nss_nis.so$(VERS)
+
+COMPATLINKS=	/usr/lib/$(DYNLIB1)
+COMPATLINKS64=	/usr/lib/$(MACH64)/$(DYNLIB1)
+
+$(ROOT)/usr/lib/$(DYNLIB1) := COMPATLINKTARGET=../../lib/$(DYNLIB1)
+$(ROOT)/usr/lib/$(MACH64)/$(DYNLIB1):= \
+	COMPATLINKTARGET=../../../lib/$(MACH64)/$(DYNLIB1)
+
 LINTFLAGS +=	-erroff=E_GLOBAL_COULD_BE_STATIC2
 LINTFLAGS64 +=	-erroff=E_GLOBAL_COULD_BE_STATIC2
 
 LDLIBS +=	-lnsl
-DYNLIB1 =	nss_nis.so$(VERS)
+
--- old/usr/src/lib/nsswitch/nis/amd64/Makefile	2019-07-05 17:34:23.858238909 +0000
+++ new/usr/src/lib/nsswitch/nis/amd64/Makefile	2019-07-05 17:34:23.876488793 +0000
@@ -23,7 +23,7 @@
 # Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
+
 #
 
 include		../Makefile.com
@@ -33,4 +33,4 @@
 
 include		../../Makefile.targ
 
-install:	all $(ROOT64DYNLIB)
+install:	all $(ROOT64DYNLIB) $(ROOTCOMPATLINKS64)
--- old/usr/src/lib/nsswitch/nis/i386/Makefile	2019-07-05 17:34:24.369045157 +0000
+++ new/usr/src/lib/nsswitch/nis/i386/Makefile	2019-07-05 17:34:24.386252563 +0000
@@ -23,7 +23,7 @@
 # Copyright 1993,2001-2003 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
+
 #
 # lib/nsswitch/nis/i386/Makefile
 
@@ -33,4 +33,4 @@
 
 include		../../Makefile.targ
 
-install:	all $(ROOTLIBS)
+install:	all $(ROOTLIBS) $(ROOTCOMPATLINKS)
--- old/usr/src/lib/nsswitch/nis/sparc/Makefile	2019-07-05 17:34:24.849889972 +0000
+++ new/usr/src/lib/nsswitch/nis/sparc/Makefile	2019-07-05 17:34:24.869559303 +0000
@@ -23,7 +23,7 @@
 # Copyright 1993,2001-2003 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
+
 #
 # lib/nsswitch/nis/sparc/Makefile
 
@@ -33,4 +33,4 @@
 
 include		../../Makefile.targ
 
-install:	all $(ROOTLIBS)
+install:	all $(ROOTLIBS) $(ROOTCOMPATLINKS)
--- old/usr/src/lib/nsswitch/nis/sparcv9/Makefile	2019-07-05 17:34:25.353023071 +0000
+++ new/usr/src/lib/nsswitch/nis/sparcv9/Makefile	2019-07-05 17:34:25.371179535 +0000
@@ -20,7 +20,7 @@
 # CDDL HEADER END
 #
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
+
 #
 # Copyright (c) 1993,2001 by Sun Microsystems, Inc.
 # All rights reserved.
@@ -34,4 +34,4 @@
 
 include		../../Makefile.targ
 
-install:	all $(ROOT64DYNLIB)
+install:	all $(ROOT64DYNLIB) $(ROOTCOMPATLINKS64)
--- old/usr/src/lib/nsswitch/user/Makefile.com	2019-07-05 17:34:25.865335717 +0000
+++ new/usr/src/lib/nsswitch/user/Makefile.com	2019-07-05 17:34:25.883091268 +0000
@@ -22,9 +22,6 @@
 # Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
-#
-# lib/nsswitch/user/Makefile.com
 
 LIBRARY =	libnss_user.a
 VERS =		.1
@@ -38,10 +35,17 @@
 # install this library in the root filesystem
 include ../../../Makefile.rootfs
 
+DYNLIB1 =	nss_user.so$(VERS)
+
+COMPATLINKS=	/usr/lib/$(DYNLIB1)
+COMPATLINKS64=	/usr/lib/$(MACH64)/$(DYNLIB1)
+
+$(ROOT)/usr/lib/$(DYNLIB1) := COMPATLINKTARGET=../../lib/$(DYNLIB1)
+$(ROOT)/usr/lib/$(MACH64)/$(DYNLIB1) := \
+	COMPATLINKTARGET=../../../lib/$(MACH64)/$(DYNLIB1)
+
 CPPFLAGS +=	-I../../../common/inc
 LINTFLAGS +=	-erroff=E_GLOBAL_COULD_BE_STATIC2 -erroff=E_FUNC_SET_NOT_USED
 LINTFLAGS64 +=	-erroff=E_GLOBAL_COULD_BE_STATIC2 -erroff=E_FUNC_SET_NOT_USED
 
-DYNLIB1 =	nss_user.so$(VERS)
-
 all: $(DYNLIB1)
--- old/usr/src/lib/nsswitch/user/amd64/Makefile	2019-07-05 17:34:26.372116177 +0000
+++ new/usr/src/lib/nsswitch/user/amd64/Makefile	2019-07-05 17:34:26.389942401 +0000
@@ -23,7 +23,7 @@
 # Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
+
 #
 
 include		../Makefile.com
@@ -33,4 +33,4 @@
 
 include		../../Makefile.targ
 
-install:	all $(ROOT64DYNLIB)
+install:	all $(ROOT64DYNLIB) $(ROOTCOMPATLINKS64)
--- old/usr/src/lib/nsswitch/user/i386/Makefile	2019-07-05 17:34:26.836314015 +0000
+++ new/usr/src/lib/nsswitch/user/i386/Makefile	2019-07-05 17:34:26.852920279 +0000
@@ -20,7 +20,7 @@
 # CDDL HEADER END
 #
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
+
 #
 # Copyright (c) 1993,2001 by Sun Microsystems, Inc.
 # All rights reserved.
@@ -33,4 +33,4 @@
 
 include		../../Makefile.targ
 
-install:	all $(ROOTLIBS)
+install:	all $(ROOTLIBS) $(ROOTCOMPATLINKS)
--- old/usr/src/lib/nsswitch/user/sparc/Makefile	2019-07-05 17:34:27.314558888 +0000
+++ new/usr/src/lib/nsswitch/user/sparc/Makefile	2019-07-05 17:34:27.331881064 +0000
@@ -20,7 +20,7 @@
 # CDDL HEADER END
 #
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
+
 #
 # Copyright (c) 1993,2001 by Sun Microsystems, Inc.
 # All rights reserved.
@@ -33,4 +33,4 @@
 
 include		../../Makefile.targ
 
-install:	all $(ROOTLIBS)
+install:	all $(ROOTLIBS) $(ROOTCOMPATLINKS)
--- old/usr/src/lib/nsswitch/user/sparcv9/Makefile	2019-07-05 17:34:27.777290448 +0000
+++ new/usr/src/lib/nsswitch/user/sparcv9/Makefile	2019-07-05 17:34:27.791251867 +0000
@@ -20,7 +20,7 @@
 # CDDL HEADER END
 #
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
+
 #
 # Copyright (c) 1993,2001 by Sun Microsystems, Inc.
 # All rights reserved.
@@ -34,4 +34,4 @@
 
 include		../../Makefile.targ
 
-install:	all $(ROOT64DYNLIB)
+install:	all $(ROOT64DYNLIB) $(ROOTCOMPATLINKS64)
--- old/usr/src/lib/print/libhttp-core/Makefile.com	2019-07-05 17:34:28.241580935 +0000
+++ new/usr/src/lib/print/libhttp-core/Makefile.com	2019-07-05 17:34:28.258889357 +0000
@@ -31,7 +31,6 @@
 ROOTLIBDIR =	$(ROOT)/usr/lib/print
 
 include ../../../Makefile.lib
-include ../../../Makefile.rootfs
 
 SRCDIR =	../common
 
--- old/usr/src/lib/print/libipp-core/Makefile.com	2019-07-05 17:34:28.639372959 +0000
+++ new/usr/src/lib/print/libipp-core/Makefile.com	2019-07-05 17:34:28.656454116 +0000
@@ -29,12 +29,9 @@
 OBJECTS = ipp.o ipp_types.o read.o strings.o write.o
 
 include ../../../Makefile.lib
-include ../../../Makefile.rootfs
 
 SRCDIR =	../common
 
-ROOTLIBDIR=	$(ROOT)/usr/lib
-
 LIBS =			$(DYNLIB)
 
 $(LINTLIB):=	SRCS = $(SRCDIR)/$(LINTSRC)
--- old/usr/src/lib/print/libipp-listener/Makefile.com	2019-07-05 17:34:29.109207943 +0000
+++ new/usr/src/lib/print/libipp-listener/Makefile.com	2019-07-05 17:34:29.126598908 +0000
@@ -36,12 +36,9 @@
 	set-printer-attributes.o validate-job.o
 
 include ../../../Makefile.lib
-include ../../../Makefile.rootfs
 
 SRCDIR =	../common
 
-ROOTLIBDIR=	$(ROOT)/usr/lib
-
 LIBS =			$(DYNLIB)
 
 $(LINTLIB):=	SRCS = $(SRCDIR)/$(LINTSRC)
--- old/usr/src/lib/print/libpapi-common/Makefile.com	2019-07-05 17:34:29.590838246 +0000
+++ new/usr/src/lib/print/libpapi-common/Makefile.com	2019-07-05 17:34:29.608003562 +0000
@@ -29,9 +29,6 @@
 OBJECTS = attribute.o common.o library.o list.o misc.o status.o uri.o
 
 include ../../../Makefile.lib
-include ../../../Makefile.rootfs
-
-ROOTLIBDIR=	$(ROOT)/usr/lib
 
 SRCDIR =	../common
 
--- old/usr/src/lib/print/libpapi-dynamic/Makefile.com	2019-07-05 17:34:30.060611569 +0000
+++ new/usr/src/lib/print/libpapi-dynamic/Makefile.com	2019-07-05 17:34:30.076730706 +0000
@@ -29,12 +29,9 @@
 OBJECTS = job.o nss.o printer.o psm.o service.o
 
 include ../../../Makefile.lib
-include ../../../Makefile.rootfs
 
 SRCDIR =	../common
 
-ROOTLIBDIR=	$(ROOT)/usr/lib
-
 LIBS =			$(DYNLIB)
 
 $(LINTLIB):=	SRCS = $(SRCDIR)/$(LINTSRC)
--- old/usr/src/lib/print/libpapi-ipp/Makefile.com	2019-07-05 17:34:30.542989705 +0000
+++ new/usr/src/lib/print/libpapi-ipp/Makefile.com	2019-07-05 17:34:30.559172595 +0000
@@ -27,10 +27,8 @@
 LIBRARY =		psm-ipp.a
 VERS =			.1
 OBJECTS = ipp-support.o job.o printer.o service.o
-ROOTLIBDIR =	$(ROOT)/usr/lib/print
 
 include ../../../Makefile.lib
-include ../../../Makefile.rootfs
 
 SRCDIR =	../common
 
--- old/usr/src/lib/print/libpapi-lpd/Makefile.com	2019-07-05 17:34:30.997421638 +0000
+++ new/usr/src/lib/print/libpapi-lpd/Makefile.com	2019-07-05 17:34:31.017672305 +0000
@@ -31,7 +31,6 @@
 	service.o $(COMMON_OBJS)
 
 include ../../../Makefile.lib
-include ../../../Makefile.rootfs
 
 SRCDIR =	../common
 
--- old/usr/src/lib/print/libprint/Makefile.com	2019-07-05 17:34:31.453142681 +0000
+++ new/usr/src/lib/print/libprint/Makefile.com	2019-07-05 17:34:31.469322514 +0000
@@ -31,12 +31,9 @@
 	ns_cmn_printer.o nss_convert.o nss_ldap.o nss_printer.o nss_write.o
 
 include ../../../Makefile.lib
-include ../../../Makefile.rootfs
 
 SRCDIR =	../common
 
-ROOTLIBDIR=	$(ROOT)/usr/lib
-
 LIBS =			$(DYNLIB)
 
 $(LINTLIB):=	SRCS = $(SRCDIR)/$(LINTSRC)
--- old/usr/src/lib/storage/liba5k/sparc/Makefile	2019-07-05 17:34:31.890181256 +0000
+++ new/usr/src/lib/storage/liba5k/sparc/Makefile	2019-07-05 17:34:31.907192921 +0000
@@ -28,4 +28,4 @@
 
 all: $(LIBS)
 
-install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT)
+install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) $(ROOTCOMPATLINKS)
--- old/usr/src/lib/storage/liba5k/sparcv9/Makefile	2019-07-05 17:34:32.386602395 +0000
+++ new/usr/src/lib/storage/liba5k/sparcv9/Makefile	2019-07-05 17:34:32.403871766 +0000
@@ -30,4 +30,4 @@
 
 all: $(LIBS)
 
-install: all $(ROOTLIBS64) $(ROOTLINKS64)
+install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64)
--- old/usr/src/lib/storage/libg_fc/sparc/Makefile	2019-07-05 17:34:32.871616993 +0000
+++ new/usr/src/lib/storage/libg_fc/sparc/Makefile	2019-07-05 17:34:32.888877984 +0000
@@ -27,4 +27,4 @@
 
 all: $(LIBS)
 
-install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT)
+install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) $(ROOTCOMPATLINKS)
--- old/usr/src/lib/storage/libg_fc/sparcv9/Makefile	2019-07-05 17:34:33.356024917 +0000
+++ new/usr/src/lib/storage/libg_fc/sparcv9/Makefile	2019-07-05 17:34:33.373659936 +0000
@@ -27,6 +27,6 @@
 
 .KEEP_STATE:
 
-all: $(LIBS) 
+all: $(LIBS)
 
-install: all $(ROOTLIBS64) $(ROOTLINKS64)
+install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTCOMPATLINKS64)
