Index: Makefile.inc
===================================================================
RCS file: /home/ncvs/src/lib/compat/Makefile.inc,v
retrieving revision 1.8
diff -u -r1.8 Makefile.inc
--- Makefile.inc	22 Sep 2001 08:11:24 -0000	1.8
+++ Makefile.inc	8 Dec 2001 20:48:40 -0000
@@ -1,6 +1,6 @@
 # $FreeBSD: src/lib/compat/Makefile.inc,v 1.8 2001/09/22 08:11:24 ru Exp $
 
-LIBCOMPATDIR?=	${LIBDIR}/compat/aout
+LIBCOMPATDIR?=	${SHLIBDIR}/compat	# XXX do we really need this?
 
 .if defined(LIBS) && !empty(LIBS)
 beforeinstall: __remove-stale-libs
@@ -8,7 +8,8 @@
 .for lib in ${LIBS}
 .if exists(${DESTDIR}${SHLIBDIR}/${lib})
 	-chflags noschg ${DESTDIR}${SHLIBDIR}/${lib}
-	rm -f ${DESTDIR}${SHLIBDIR}/${lib}
+	mv -f ${DESTDIR}${SHLIBDIR}/${lib} \
+	    ${DESTDIR}${LIBCOMPATDIR}${COMPATSUBDIR}/${lib}
 .endif
 .endfor
 .endif
Index: compat1x/Makefile
===================================================================
RCS file: /home/ncvs/src/lib/compat/compat1x/Makefile,v
retrieving revision 1.13
diff -u -r1.13 Makefile
--- compat1x/Makefile	21 Sep 2001 11:32:40 -0000	1.13
+++ compat1x/Makefile	8 Dec 2001 20:48:40 -0000
@@ -1,6 +1,7 @@
 # $FreeBSD: src/lib/compat/compat1x/Makefile,v 1.13 2001/09/21 11:32:40 ru Exp $
 
 DISTRIBUTION=	compat1x
+COMPATSUBDIR=	/aout
 
 LIBS=	libc.so.1.1 libcurses.so.1.1 libf2c.so.1.1 libg++.so.1.1 \
 	libgcc.so.1.1 libgnumalloc.so.1.1 libgnuregex.so.1.1 libln.so.1.1 \
@@ -21,7 +22,7 @@
 
 beforeinstall:
 	${INSTALL} ${COPY} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} ${LIBS} \
-		${DESTDIR}${LIBCOMPATDIR}/aout
+		${DESTDIR}${LIBCOMPATDIR}${COMPATSUBDIR}
 
 # Get all the fruit, even though we don't set PROG.
 # XXX bsd.lib.mk has fruitflies, e.g., it fails if LIBS is empty.
Index: compat20/Makefile
===================================================================
RCS file: /home/ncvs/src/lib/compat/compat20/Makefile,v
retrieving revision 1.13
diff -u -r1.13 Makefile
--- compat20/Makefile	21 Sep 2001 11:32:41 -0000	1.13
+++ compat20/Makefile	8 Dec 2001 20:48:40 -0000
@@ -1,6 +1,7 @@
 # $FreeBSD: src/lib/compat/compat20/Makefile,v 1.13 2001/09/21 11:32:41 ru Exp $
 
 DISTRIBUTION=	compat20
+COMPATSUBDIR=	/aout
 
 LIBS=	libdialog.so.2.0 libforms.so.2.0 libg++.so.2.0 libgcc.so.261.0 \
 	libncurses.so.2.0 libreadline.so.2.0
@@ -18,7 +19,7 @@
 	${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} ld.so \
 		${DESTDIR}/usr/libexec
 	${INSTALL} ${COPY} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} ${LIBS} \
-		${DESTDIR}${LIBCOMPATDIR}/aout
+		${DESTDIR}${LIBCOMPATDIR}${COMPATSUBDIR}
 
 # Get all the fruit, even though we don't set PROG.
 # XXX bsd.lib.mk has fruitflies, e.g., it fails if LIBS is empty.
Index: compat21/Makefile
===================================================================
RCS file: /home/ncvs/src/lib/compat/compat21/Makefile,v
retrieving revision 1.15
diff -u -r1.15 Makefile
--- compat21/Makefile	21 Sep 2001 11:32:47 -0000	1.15
+++ compat21/Makefile	8 Dec 2001 20:48:40 -0000
@@ -1,6 +1,7 @@
 # $FreeBSD: src/lib/compat/compat21/Makefile,v 1.15 2001/09/21 11:32:47 ru Exp $
 
 DISTRIBUTION=	compat21
+COMPATSUBDIR=	/aout
 
 LIBS=	libc.so.2.2 libg++.so.3.0 libgmp.so.2.0
 
@@ -17,7 +18,7 @@
 	${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} ld.so \
 		${DESTDIR}/usr/libexec
 	${INSTALL} ${COPY} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} ${LIBS} \
-		${DESTDIR}${LIBCOMPATDIR}/aout
+		${DESTDIR}${LIBCOMPATDIR}${COMPATSUBDIR}
 
 # Get all the fruit, even though we don't set PROG.
 # XXX bsd.lib.mk has fruitflies, e.g., it fails if LIBS is empty.
Index: compat22/Makefile
===================================================================
RCS file: /home/ncvs/src/lib/compat/compat22/Makefile,v
retrieving revision 1.7
diff -u -r1.7 Makefile
--- compat22/Makefile	21 Sep 2001 11:32:48 -0000	1.7
+++ compat22/Makefile	8 Dec 2001 20:48:40 -0000
@@ -1,6 +1,7 @@
 # $FreeBSD: src/lib/compat/compat22/Makefile,v 1.7 2001/09/21 11:32:48 ru Exp $
 
 DISTRIBUTION=	compat22
+COMPATSUBDIR=	/aout
 
 LIBS=	libalias.so.2.4 libc.so.3.1 libc_r.so.3.0 libcalendar.so.2.0 \
 	libcom_err.so.2.0 libcurses.so.2.0 libdialog.so.3.1 libedit.so.2.0 \
@@ -25,12 +26,12 @@
 	${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} ld.so \
 		${DESTDIR}/usr/libexec
 	${INSTALL} ${COPY} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} ${LIBS} \
-		${DESTDIR}${LIBCOMPATDIR}/aout
+		${DESTDIR}${LIBCOMPATDIR}${COMPATSUBDIR}
 	@${ECHO} "libcrypt.so.2.0 -> libscrypt.so.2.0" ; \
-		cd ${DESTDIR}${LIBCOMPATDIR}/aout ; \
+		cd ${DESTDIR}${LIBCOMPATDIR}${COMPATSUBDIR} ; \
 		ln -sf libscrypt.so.2.0 libcrypt.so.2.0
 	@${ECHO} "libtermlib.so.2.1 -> libtermcap.so.2.1" ; \
-		cd ${DESTDIR}${LIBCOMPATDIR}/aout ; \
+		cd ${DESTDIR}${LIBCOMPATDIR}${COMPATSUBDIR} ; \
 		ln -sf libtermcap.so.2.1 libtermlib.so.2.1
 
 # Get all the fruit, even though we don't set PROG.