From f803ec1ef53f5da327a84057c26afae5b625ab61 Mon Sep 17 00:00:00 2001 From: Brad Davis Date: Wed, 19 Sep 2018 09:29:06 +0000 Subject: [PATCH] Move regdomain.xml to lib/lib80211/ This leverages CONFS to handle the install. lib80211 was picked because it is where this file is actually used from. Approved by: re (blanket, pkgbase), will (mentor) Differential Revision: https://reviews.freebsd.org/D17229 --- etc/Makefile | 4 ---- lib/lib80211/Makefile | 1 + {etc => lib/lib80211}/regdomain.xml | 0 3 files changed, 1 insertion(+), 4 deletions(-) rename {etc => lib/lib80211}/regdomain.xml (100%) diff --git a/etc/Makefile b/etc/Makefile index 67153d8a67c9..1534b451ef00 100644 --- a/etc/Makefile +++ b/etc/Makefile @@ -36,10 +36,6 @@ SSL= ${SRCTOP}/crypto/openssl/apps/openssl.cnf BIN1+= rc.sendmail .endif -.if ${MK_WIRELESS} != "no" -BIN1+= regdomain.xml -.endif - .if ${MK_SENDMAIL} == "no" ETCMAIL=mailer.conf aliases .else diff --git a/lib/lib80211/Makefile b/lib/lib80211/Makefile index fe103ce81cbd..54efe869b84a 100644 --- a/lib/lib80211/Makefile +++ b/lib/lib80211/Makefile @@ -1,5 +1,6 @@ # $FreeBSD$ +CONFS= regdomain.xml PACKAGE=lib${LIB} LIB= 80211 SHLIBDIR?= /lib diff --git a/etc/regdomain.xml b/lib/lib80211/regdomain.xml similarity index 100% rename from etc/regdomain.xml rename to lib/lib80211/regdomain.xml