Attachment 98131 Details for Bug 75858 – Make sure bindir is in .pc file and daemondir there is unexpanded

[patch] Make sure bindir is in .pc file and daemondir there is unexpanded

0001-Make-sure-bindir-is-in-.pc-file-and-daemondir-there-.patch (text/plain), 1.19 KB, created by LRN on 2014-04-28 17:12:56 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: LRN

Created: 2014-04-28 17:12:56 UTC

Size: 1.19 KB

patch

obsolete

>From 39d471af3a8b277ab8ed545eff4408bb5d8dcde7 Mon Sep 17 00:00:00 2001
>From: =?UTF-8?q?=D0=A0=D1=83=D1=81=D0=BB=D0=B0=D0=BD=20=D0=98=D0=B6=D0=B1?=
> =?UTF-8?q?=D1=83=D0=BB=D0=B0=D1=82=D0=BE=D0=B2?= <lrn1986@gmail.com>
>Date: Mon, 28 Apr 2014 17:11:25 +0000
>Subject: [PATCH] Make sure bindir is in .pc file and daemondir there is
> unexpanded
>
>---
> configure.ac | 2 +-
> dbus-1.pc.in | 1 +
> 2 files changed, 2 insertions(+), 1 deletion(-)
>
>diff --git a/configure.ac b/configure.ac
>index 633bdc9..7879c4d 100644
>--- a/configure.ac
>+++ b/configure.ac
>@@ -1584,7 +1584,7 @@ AC_DEFINE_UNQUOTED(DBUS_DATADIR,"$DBUS_DATADIR", [Directory for installing DBUS
> #### Directory to install dbus-daemon
> if test -z "$with_dbus_daemondir" ; then
>     DBUS_DAEMONDIR=$EXPANDED_BINDIR
>-    dbus_daemondir=$EXPANDED_BINDIR
>+    dbus_daemondir=$bindir
> else
>     DBUS_DAEMONDIR=$with_dbus_daemondir
>     dbus_daemondir=$with_dbus_daemondir
>diff --git a/dbus-1.pc.in b/dbus-1.pc.in
>index 7e8aad1..1bbc504 100644
>--- a/dbus-1.pc.in
>+++ b/dbus-1.pc.in
>@@ -1,5 +1,6 @@
> prefix=@prefix@
> exec_prefix=@exec_prefix@
>+bindir=@bindir@
> libdir=@libdir@
> includedir=@includedir@
> system_bus_default_address=@DBUS_SYSTEM_BUS_DEFAULT_ADDRESS@
>-- 
>1.8.5.3
>

Actions: View | Splinter Review

Attachments on bug 75858: 95264 | 95265 | 95341 | 95342 | 95349 | 95944 | 98131 | 98256

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.