From owner-svn-src-head@freebsd.org Thu Sep 3 03:48:43 2020 Return-Path: Delivered-To: svn-src-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 0ABC83D7A48; Thu, 3 Sep 2020 03:48:43 +0000 (UTC) (envelope-from stevek@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Bhmxk6Vxcz3W4g; Thu, 3 Sep 2020 03:48:42 +0000 (UTC) (envelope-from stevek@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id C425715770; Thu, 3 Sep 2020 03:48:42 +0000 (UTC) (envelope-from stevek@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 0833mgMV059138; Thu, 3 Sep 2020 03:48:42 GMT (envelope-from stevek@FreeBSD.org) Received: (from stevek@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 0833mghN059137; Thu, 3 Sep 2020 03:48:42 GMT (envelope-from stevek@FreeBSD.org) Message-Id: <202009030348.0833mghN059137@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: stevek set sender to stevek@FreeBSD.org using -f From: "Stephen J. Kiernan" Date: Thu, 3 Sep 2020 03:48:42 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r365286 - head/lib/libucl X-SVN-Group: head X-SVN-Commit-Author: stevek X-SVN-Commit-Paths: head/lib/libucl X-SVN-Commit-Revision: 365286 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 03 Sep 2020 03:48:43 -0000 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