From patchwork Thu Jul 16 20:32:26 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "W. Michael Petullo" X-Patchwork-Id: 11668455 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 7E074722 for ; Thu, 16 Jul 2020 20:39:13 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 63C1C20809 for ; Thu, 16 Jul 2020 20:39:13 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726359AbgGPUjN (ORCPT ); Thu, 16 Jul 2020 16:39:13 -0400 Received: from smtprelay0137.b.hostedemail.com ([64.98.42.137]:39784 "EHLO smtprelay.b.hostedemail.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1726204AbgGPUjM (ORCPT ); Thu, 16 Jul 2020 16:39:12 -0400 X-Greylist: delayed 590 seconds by postgrey-1.27 at vger.kernel.org; Thu, 16 Jul 2020 16:39:12 EDT Received: from smtprelay.b.hostedemail.com (10.5.19.248.rfc1918.com [10.5.19.248]) by smtpgrave02.b.hostedemail.com (Postfix) with ESMTP id 935AE1804FE28 for ; Thu, 16 Jul 2020 20:32:28 +0000 (UTC) Received: from filter.hostedemail.com (10.5.19.248.rfc1918.com [10.5.19.248]) by smtprelay02.b.hostedemail.com (Postfix) with ESMTP id EDFF08001923 for ; Thu, 16 Jul 2020 20:32:27 +0000 (UTC) X-Session-Marker: 6D696B6540666C796E2E6F7267 X-Spam-Summary: 2,0,0,,d41d8cd98f00b204,mike@flyn.org,,RULES_HIT:41:152:196:355:379:800:960:973:982:988:989:1260:1277:1311:1313:1314:1345:1381:1437:1515:1516:1518:1534:1541:1593:1594:1711:1730:1747:1777:1792:2393:2559:2562:2910:3138:3139:3140:3141:3142:3352:3571:3866:3868:3870:3872:4321:5007:6261:7653:8957:9163:10004:10400:10848:10903:11658:11914:12043:12297:12555:12679:12760:12895:12986:13069:13311:13357:14096:14097:14181:14394:14659:14721:21080:21451:21627:30029:30054,0,RBL:none,CacheIP:none,Bayesian:0.5,0.5,0.5,Netcheck:none,DomainCache:0,MSF:not bulk,SPF:,MSBL:0,DNSBL:none,Custom_rules:0:0:0,LFtime:3,LUA_SUMMARY:none X-HE-Tag: toe00_4a1009526f05 X-Filterd-Recvd-Size: 1889 Received: from imp (pool-173-67-42-132.bltmmd.fios.verizon.net [173.67.42.132]) (Authenticated sender: mike@flyn.org) by omf09.b.hostedemail.com (Postfix) with ESMTPA for ; Thu, 16 Jul 2020 20:32:27 +0000 (UTC) Message-ID: <8ebd6f4ab80e8b73ce3b4ff4e146c39b2123cec3.camel@flyn.org> Subject: [PATCH] selinux: make use of variables when defining libdir and includedir From: "W. Michael Petullo" To: selinux@vger.kernel.org Date: Thu, 16 Jul 2020 15:32:26 -0500 User-Agent: Evolution 3.36.3 (3.36.3-1.fc32) MIME-Version: 1.0 Sender: selinux-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: selinux@vger.kernel.org Pkg-config definitions commonly make use of ${exec_prefix} and ${prefix} when defining libdir and includedir, respectively. OpenWrt, for example, relies on this when it adjusts things for cross compiling. Signed-off-by: W. Michael Petullo --- libselinux/src/libselinux.pc.in | 4 ++-- libsepol/src/libsepol.pc.in | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/libselinux/src/libselinux.pc.in b/libselinux/src/libselinux.pc.in index 7c66b1fa..d9d58125 100644 --- a/libselinux/src/libselinux.pc.in +++ b/libselinux/src/libselinux.pc.in @@ -1,7 +1,7 @@ prefix=@prefix@ exec_prefix=${prefix} -libdir=@libdir@ -includedir=@includedir@ +libdir=${exec_prefix}/lib +includedir=${prefix}/include Name: libselinux Description: SELinux utility library diff --git a/libsepol/src/libsepol.pc.in b/libsepol/src/libsepol.pc.in index f807fec6..cf2411e4 100644 --- a/libsepol/src/libsepol.pc.in +++ b/libsepol/src/libsepol.pc.in @@ -1,7 +1,7 @@ prefix=@prefix@ exec_prefix=${prefix} -libdir=@libdir@ -includedir=@includedir@ +libdir=${exec_prefix}/lib +includedir=${prefix}/include Name: libsepol Description: SELinux policy library