Attachment 118417 Details for Bug 92094 – Patch to not hardcode libdir but instead use from environment

[patch] Patch to not hardcode libdir but instead use from environment

0001-Do-not-hardcode-libdir.patch (text/plain), 2.17 KB, created by Reinette Chatre on 2015-09-23 21:48:55 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Reinette Chatre

Created: 2015-09-23 21:48:55 UTC

Size: 2.17 KB

patch

obsolete

>From 20af956f13e59d1a6ea42f71911c5ec95bb20028 Mon Sep 17 00:00:00 2001
>Message-Id: <20af956f13e59d1a6ea42f71911c5ec95bb20028.1443044561.git.reinette.chatre@intel.com>
>From: Reinette Chatre <reinette.chatre@intel.com>
>Date: Wed, 23 Sep 2015 14:35:00 -0700
>Subject: [PATCH] Do not hardcode libdir
>
>We would like to use polkit on systems that support Application Binary
>Interface (http://www.x86-64.org/documentation/abi.pdf) and
>File Hierarchy Standard (http://www.pathname.com/fhs/) where on 64 bit
>systems the library directory is /usr/lib64. By not hardcoding the library
>directory and instead using libdir from the environment we can support these
>environments.
>
>Suggested-by: Chunrong Guo <B40290@freescale.com>
>Signed-off-by: Reinette Chatre <reinette.chatre@intel.com>
>---
> data/Makefile.am              | 2 +-
> src/polkitagent/Makefile.am   | 2 +-
> src/polkitbackend/Makefile.am | 2 +-
> 3 files changed, 3 insertions(+), 3 deletions(-)
>
>diff --git a/data/Makefile.am b/data/Makefile.am
>index fe0f1d5..52cb4b4 100644
>--- a/data/Makefile.am
>+++ b/data/Makefile.am
>@@ -2,7 +2,7 @@
> 
> NULL =
> 
>-libprivdir = $(prefix)/lib/polkit-1
>+libprivdir = $(libdir)/polkit-1
> 
> # ----------------------------------------------------------------------------------------------------
> 
>diff --git a/src/polkitagent/Makefile.am b/src/polkitagent/Makefile.am
>index 4b64165..9521634 100644
>--- a/src/polkitagent/Makefile.am
>+++ b/src/polkitagent/Makefile.am
>@@ -78,7 +78,7 @@ libpolkit_agent_1_la_LIBADD =                               		\
> 
> libpolkit_agent_1_la_LDFLAGS = -export-symbols-regex '(^polkit_.*)'
> 
>-libprivdir = $(prefix)/lib/polkit-1
>+libprivdir = $(libdir)/polkit-1
> libpriv_PROGRAMS = polkit-agent-helper-1
> 
> polkit_agent_helper_1_SOURCES = 					\
>diff --git a/src/polkitbackend/Makefile.am b/src/polkitbackend/Makefile.am
>index 547ca82..78ed934 100644
>--- a/src/polkitbackend/Makefile.am
>+++ b/src/polkitbackend/Makefile.am
>@@ -67,7 +67,7 @@ rules_DATA = 50-default.rules
> 
> # ----------------------------------------------------------------------------------------------------
> 
>-libprivdir = $(prefix)/lib/polkit-1
>+libprivdir = $(libdir)/polkit-1
> libpriv_PROGRAMS = polkitd
> 
> polkitd_SOURCES = 							\
>-- 
>2.4.3
>

Actions: View | Splinter Review

Attachments on bug 92094: 118417

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.