From 95fe17a96d0488da79c5773da9b86b5431fa28c9 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?= Date: Sat, 8 Mar 2014 07:34:35 +0000 Subject: Let pkg-config expand directory variables recursively In particular this makes them more MinGW-friendly: pkg-config on Windows has specific code to rewrite the ${prefix} when installed in a different prefix. [add @datarootdir@, expand commit message -smcv] Reviewed-by: Simon McVittie Bug: https://bugs.freedesktop.org/show_bug.cgi?id=75858 --- dbus-1.pc.in | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) (limited to 'dbus-1.pc.in') diff --git a/dbus-1.pc.in b/dbus-1.pc.in index 25f8bcee..f93d1563 100644 --- a/dbus-1.pc.in +++ b/dbus-1.pc.in @@ -1,13 +1,16 @@ prefix=@prefix@ exec_prefix=@exec_prefix@ +bindir=@bindir@ libdir=@libdir@ includedir=@includedir@ system_bus_default_address=@DBUS_SYSTEM_BUS_DEFAULT_ADDRESS@ -sysconfdir=@EXPANDED_SYSCONFDIR@ -session_bus_services_dir=@EXPANDED_DATADIR@/dbus-1/services -system_bus_services_dir=@EXPANDED_DATADIR@/dbus-1/system-services -interfaces_dir=@EXPANDED_DATADIR@/dbus-1/interfaces -daemondir=@DBUS_DAEMONDIR@ +datarootdir=@datarootdir@ +datadir=@datadir@ +sysconfdir=@sysconfdir@ +session_bus_services_dir=${datadir}/dbus-1/services +system_bus_services_dir=${datadir}/dbus-1/system-services +interfaces_dir=${datadir}/dbus-1/interfaces +daemondir=@dbus_daemondir@ Name: dbus Description: Free desktop message bus -- cgit v1.2.1