pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

fix sysconfdir location



Module Name:	pkgsrc-wip
Committed By:	Frank Kardel <kardel%NetBSD.org@localhost>
Pushed By:	kardel
Date:		Mon Oct 12 16:23:39 2020 +0200
Changeset:	09cb79a5556f2bdb1c9dc5e6ca9495c871c878f6

Modified Files:
	frr/Makefile

Log Message:
fix sysconfdir location

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=09cb79a5556f2bdb1c9dc5e6ca9495c871c878f6

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 frr/Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diffs:
diff --git a/frr/Makefile b/frr/Makefile
index d5300c721b..3227a3a7bd 100644
--- a/frr/Makefile
+++ b/frr/Makefile
@@ -19,7 +19,6 @@ USE_LANGUAGES=		c c++
 USE_TOOLS+=		gmake perl bash pkg-config autoconf automake autoreconf
 USE_LIBTOOL=		YES
 GNU_CONFIGURE=		yes
-PKG_SYSCONFSUBDIR=	frr
 BUILD_DEFS=		VARBASE
 
 .include "../../mk/bsd.prefs.mk"
@@ -32,6 +31,7 @@ FRR_USER?=		_frr
 FRR_CONF_MODE=		0640
 FRR_LOG_MODE=		0640
 PKG_SYSCONFDIR_PERMS=	${FRR_USER} ${FRR_GROUP} 0750
+PKG_SYSCONFSUBDIR=	frr
 
 PKG_GECOS.${FRR_USER}=	FRRouting User
 PKG_HOME.${FRR_USER}=	/nonexistent
@@ -67,7 +67,7 @@ SUBST_FILES.workdir=	lib/version.h
 SUBST_SED.workdir=	-e "s,${WRKDIR},"'{WRKDIR},g'
 SUBST_VARS.workdir=
 
-CONFIGURE_ARGS?=	--sysconfdir=${PREFIX}/etc/${PKG_SYSCONFSUBDIR}
+CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR}
 CONFIGURE_ARGS+=	--enable-user=${FRR_USER}
 CONFIGURE_ARGS+=	--enable-group=${FRR_GROUP}
 CONFIGURE_ARGS+=	--enable-exampledir=${PREFIX}/${CONFIG_TEMPLATE_PATH}


Home | Main Index | Thread Index | Old Index