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
This commit is contained in:
parent
1a578e6668
commit
95fe17a96d
|
@ -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
|
||||
|
|
|
@ -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)
|
||||
|
|
13
dbus-1.pc.in
13
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
|
||||
|
|
Loading…
Reference in New Issue