Author: tijl
Date: Sun May 31 17:20:17 2020
New Revision: 361663
URL: https://svnweb.freebsd.org/changeset/base/361663
Log:
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
Modified:
head/etc/mtree/BSD.lib32.dist
head/lib/libxo/encoder/csv/Makefile
head/lib/libxo/libxo/Makefile
Modified: head/etc/mtree/BSD.lib32.dist
==============================================================================
--- head/etc/mtree/BSD.lib32.dist Sun May 31 15:31:47 2020
(r361662)
+++ head/etc/mtree/BSD.lib32.dist Sun May 31 17:20:17 2020
(r361663)
@@ -12,5 +12,9 @@
..
i18n
..
+ libxo
+ encoder
+ ..
+ ..
..
..
Modified: head/lib/libxo/encoder/csv/Makefile
==============================================================================
--- head/lib/libxo/encoder/csv/Makefile Sun May 31 15:31:47 2020
(r361662)
+++ head/lib/libxo/encoder/csv/Makefile Sun May 31 17:20:17 2020
(r361663)
@@ -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
+SHLIBDIR= ${LIBDIR}/libxo/encoder
+SHLIB_NAME= csv.enc
-LIB= enc_csv
-SHLIB_MAJOR=0
-SHLIB_NAME= lib${LIB}.so
-
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>
Modified: head/lib/libxo/libxo/Makefile
==============================================================================
--- head/lib/libxo/libxo/Makefile Sun May 31 15:31:47 2020
(r361662)
+++ head/lib/libxo/libxo/Makefile Sun May 31 17:20:17 2020
(r361663)
@@ -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
_______________________________________________
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
