From 3eee8f1cbb825b6ea3efc7fef6137b5b39aa6b2b Mon Sep 17 00:00:00 2001
From: Tijl Coosemans <tijl@FreeBSD.org>
Date: Sun, 31 May 2020 17:20:17 +0000
Subject: [PATCH] Fix installation of libxo encoder modules.

Because the install location was hardcoded in the Makefile as
/usr/lib/libxo/encoder, the lib32 version was installed over the native
version.  Replace /usr/lib with ${LIBDIR}.

Also define SHLIB_NAME instead of LIB + FILES.  This prevents building a
static library.

MFC after:	2 weeks
---
 etc/mtree/BSD.lib32.dist       |  4 ++++
 lib/libxo/encoder/csv/Makefile | 19 +++----------------
 lib/libxo/libxo/Makefile       |  2 +-
 3 files changed, 8 insertions(+), 17 deletions(-)

diff --git a/etc/mtree/BSD.lib32.dist b/etc/mtree/BSD.lib32.dist
index 3e2d80fd6cae..d1288462b15a 100644
--- a/etc/mtree/BSD.lib32.dist
+++ b/etc/mtree/BSD.lib32.dist
@@ -12,5 +12,9 @@
         ..
         i18n
         ..
+        libxo
+            encoder
+            ..
+        ..
     ..
 ..
diff --git a/lib/libxo/encoder/csv/Makefile b/lib/libxo/encoder/csv/Makefile
index ffde7210937d..f4c3cb88aebd 100644
--- a/lib/libxo/encoder/csv/Makefile
+++ b/lib/libxo/encoder/csv/Makefile
@@ -8,30 +8,17 @@ LIBXOSRC=	${SRCTOP}/contrib/libxo
 
 .PATH:	${LIBXOSRC}/encoder/csv
 
-# We use FILES to install the encoder library under the proper/magic
-# name, in the proper/magic directory.  libxo looks for encoders from
-# "--libxo encoder=name" as "${prefix}/lib/libxo/encoder/${name}.enc"
-FILES = libenc_csv.so
-FILESNAME_libenc_csv.so= csv.enc
-FILESDIR = /usr/lib/libxo/encoder
-
-LIB=	enc_csv
-SHLIB_MAJOR=0
-SHLIB_NAME=     lib${LIB}.so
+SHLIBDIR=	${LIBDIR}/libxo/encoder
+SHLIB_NAME=	csv.enc
 
 SRCS=	enc_csv.c
 
 CFLAGS+=-I${LIBXOSRC}/libxo -I${.CURDIR}
-CFLAGS+=-DXO_ENCODERDIR=\"/usr/lib/libxo/encoder\"
+CFLAGS+=-DXO_ENCODERDIR=\"${LIBDIR}/libxo/encoder\"
 
 LIBADD=	util xo
 LDFLAGS += -L${.OBJDIR:H:H}/libxo
 
 WARNS?= 5
 
-# Need to define a fake "install" target to block the one in bsd.lib.mk,
-# since that one will install our lib in the wrong place (/usr/lib/).
-install: realinstall
-
 .include <bsd.lib.mk>
-.include <bsd.files.mk>
diff --git a/lib/libxo/libxo/Makefile b/lib/libxo/libxo/Makefile
index 355f56f136c1..86a94e323d0e 100644
--- a/lib/libxo/libxo/Makefile
+++ b/lib/libxo/libxo/Makefile
@@ -16,7 +16,7 @@ SHLIB_MAJOR=0
 SRCS=	libxo.c xo_encoder.c xo_syslog.c
 
 CFLAGS+=-I${LIBXOSRC}/libxo -I${.CURDIR}
-CFLAGS+=-DXO_ENCODERDIR=\"/usr/lib/libxo/encoder\"
+CFLAGS+=-DXO_ENCODERDIR=\"${LIBDIR}/libxo/encoder\"
 
 INCS=	xo.h xo_encoder.h
 INCSDIR=${INCLUDEDIR}/libxo