diff options
| author | Руслан Ижбулатов <lrn1986@gmail.com> | 2014-03-08 07:34:35 +0000 |
|---|---|---|
| committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2014-10-13 13:41:36 +0100 |
| commit | 95fe17a96d0488da79c5773da9b86b5431fa28c9 (patch) | |
| tree | 0d7780757d142831d9dca25052ed8315703e783d | |
| parent | 1a578e66684507b6dcee791ba1de1343e7a36280 (diff) | |
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 <simon.mcvittie@collabora.co.uk>
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=75858
| -rw-r--r-- | configure.ac | 3 | ||||
| -rw-r--r-- | dbus-1-uninstalled.pc.in | 13 | ||||
| -rw-r--r-- | dbus-1.pc.in | 13 |
3 files changed, 19 insertions, 10 deletions
diff --git a/configure.ac b/configure.ac index 2d56fff6..89e4d2ec 100644 --- a/configure.ac +++ b/configure.ac @@ -1583,10 +1583,13 @@ 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='$bindir' else DBUS_DAEMONDIR=$with_dbus_daemondir + dbus_daemondir=$with_dbus_daemondir fi AC_SUBST(DBUS_DAEMONDIR) +AC_SUBST(dbus_daemondir) AC_DEFINE_UNQUOTED(DBUS_DAEMONDIR,"$DBUS_DAEMONDIR", [Directory for installing the DBUS daemon]) #### Directory to install the other binaries diff --git a/dbus-1-uninstalled.pc.in b/dbus-1-uninstalled.pc.in index 038c83e2..b66ad2f6 100644 --- a/dbus-1-uninstalled.pc.in +++ b/dbus-1-uninstalled.pc.in @@ -2,12 +2,15 @@ abs_top_builddir=@abs_top_builddir@ abs_top_srcdir=@abs_top_srcdir@ prefix= exec_prefix= +bindir=@bindir@ 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 (uninstalled copy) 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 |