diff options
| author | Tijl Coosemans <tijl@FreeBSD.org> | 2020-05-31 17:20:17 +0000 |
|---|---|---|
| committer | Tijl Coosemans <tijl@FreeBSD.org> | 2020-05-31 17:20:17 +0000 |
| commit | 3eee8f1cbb825b6ea3efc7fef6137b5b39aa6b2b (patch) | |
| tree | 9adbd0d329cdc0cc4fb0bd72390f88a6fab5f12c /lib/libxo | |
| parent | 796bf3133bacd37513d0333ecba2b3ef9e7bb935 (diff) | |
Notes
Diffstat (limited to 'lib/libxo')
| -rw-r--r-- | lib/libxo/encoder/csv/Makefile | 19 | ||||
| -rw-r--r-- | lib/libxo/libxo/Makefile | 2 |
2 files changed, 4 insertions, 17 deletions
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 |