diff options
| author | ngie <ngie@FreeBSD.org> | 2015-10-06 07:28:54 +0000 |
|---|---|---|
| committer | ngie <ngie@FreeBSD.org> | 2015-10-06 07:28:54 +0000 |
| commit | f61b60624c8d04156826dd91d4c4e605f76248dd (patch) | |
| tree | cc0d728b2d51cf44471bd0b5081268507b2eb246 | |
| parent | 945e362d2bdc9f7cc475b22a4d5eca8bb5b0e707 (diff) | |
| download | FreeBSD-src-f61b60624c8d04156826dd91d4c4e605f76248dd.zip FreeBSD-src-f61b60624c8d04156826dd91d4c4e605f76248dd.tar.gz | |
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
| -rw-r--r-- | lib/libxo/Makefile | 6 | ||||
| -rw-r--r-- | usr.bin/xo/Makefile | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/lib/libxo/Makefile b/lib/libxo/Makefile index 8ca1292..05f5f27 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 diff --git a/usr.bin/xo/Makefile b/usr.bin/xo/Makefile index be22618..a287608 100644 --- a/usr.bin/xo/Makefile +++ b/usr.bin/xo/Makefile @@ -1,14 +1,14 @@ # $FreeBSD$ -LIBXO= ${.CURDIR:H:H}/contrib/libxo +LIBXOSRC= ${SRCTOP}/contrib/libxo -.PATH: ${LIBXO}/xo +.PATH: ${LIBXOSRC}/xo PROG= xo MAN= xo.1 # XXX For xoversion.h -CFLAGS+=-I${LIBXO}/libxo +CFLAGS+=-I${LIBXOSRC}/libxo LIBADD= xo util |
