Author: stevek
Date: Thu Sep 3 03:48:42 2020
New Revision: 365286
URL: https://svnweb.freebsd.org/changeset/base/365286
Log:
Avoid issues with STAGING by using LIBUCL_DIR for the source directory
variable name instead of LIBUCL (which would otherwise end up with the
staging directory used instead of the wanted source directory.)
Reviewed by: sjg
Obtained from: Juniper Networks, Inc.
Modified:
head/lib/libucl/Makefile
Modified: head/lib/libucl/Makefile
==============================================================================
--- head/lib/libucl/Makefile Thu Sep 3 02:17:55 2020 (r365285)
+++ head/lib/libucl/Makefile Thu Sep 3 03:48:42 2020 (r365286)
@@ -1,6 +1,6 @@
# $FreeBSD$
-LIBUCL= ${SRCTOP}/contrib/libucl
+LIBUCL_DIR= ${SRCTOP}/contrib/libucl
PACKAGE=lib${LIB}
LIB= ucl
@@ -16,18 +16,18 @@ SRCS= ucl_emitter_streamline.c \
ucl_sexp.c \
ucl_util.c
-.PATH: ${LIBUCL}/src \
- ${LIBUCL}/include \
- ${LIBUCL}/doc
+.PATH: ${LIBUCL_DIR}/src \
+ ${LIBUCL_DIR}/include \
+ ${LIBUCL_DIR}/doc
INCS= ucl.h
LIBADD= m
WARNS= 1
-CFLAGS+= -I${LIBUCL}/include \
- -I${LIBUCL}/src \
- -I${LIBUCL}/uthash \
- -I${LIBUCL}/klib
+CFLAGS+= -I${LIBUCL_DIR}/include \
+ -I${LIBUCL_DIR}/src \
+ -I${LIBUCL_DIR}/uthash \
+ -I${LIBUCL_DIR}/klib
MAN+= libucl.3
_______________________________________________
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"
