From 8fd6288237a05e9501bdf9fb37d8061aa14a5f63 Mon Sep 17 00:00:00 2001
From: stevek <stevek@FreeBSD.org>
Date: Thu, 3 Sep 2020 03:48:42 +0000
Subject: [PATCH] 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.
---
 lib/libucl/Makefile | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/lib/libucl/Makefile b/lib/libucl/Makefile
index dc2ea91a026..3624e3121d1 100644
--- a/lib/libucl/Makefile
+++ b/lib/libucl/Makefile
@@ -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
 
-- 
2.45.0