diff options
| author | Enji Cooper <ngie@FreeBSD.org> | 2015-10-06 07:28:54 +0000 |
|---|---|---|
| committer | Enji Cooper <ngie@FreeBSD.org> | 2015-10-06 07:28:54 +0000 |
| commit | 7fd25aff6b5c9f18888769256a2ef6f66bcc0f57 (patch) | |
| tree | cc0d728b2d51cf44471bd0b5081268507b2eb246 /lib/libxo | |
| parent | 27e9ed8a5a421b104485f20606c2563346791a11 (diff) | |
| download | src-7fd25aff6b5c9f18888769256a2ef6f66bcc0f57.tar.gz src-7fd25aff6b5c9f18888769256a2ef6f66bcc0f57.zip | |
Use LIBXOSRC instead of LIBXO when defining the path to contrib/libxo
The latter is already defined in bsd.libnames.mk, so avoid the conflict
in case someone copy-pastes make variables
While here, switch path to the top of the source tree with SRCTOP
Notes
Notes:
svn path=/head/; revision=288913
Diffstat (limited to 'lib/libxo')
| -rw-r--r-- | lib/libxo/Makefile | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/libxo/Makefile b/lib/libxo/Makefile index 8ca129221eb8..05f5f27e76a7 100644 --- a/lib/libxo/Makefile +++ b/lib/libxo/Makefile @@ -1,8 +1,8 @@ # $FreeBSD$ -LIBXO= ${.CURDIR:H:H}/contrib/libxo +LIBXOSRC= ${SRCTOP}/contrib/libxo -.PATH: ${LIBXO}/libxo +.PATH: ${LIBXOSRC}/libxo LIB= xo SHLIB_MAJOR=0 @@ -11,7 +11,7 @@ SHLIBDIR?= /lib SRCS= libxo.c xo_encoder.c xo_syslog.c -CFLAGS+=-I${LIBXO}/libxo +CFLAGS+=-I${LIBXOSRC}/libxo CFLAGS+=-DXO_ENCODERDIR=\"/usr/lib/libxo/encoder\" INCS= xo.h xo_encoder.h |