diff options
| author | Michael Olbrich <m.olbrich@pengutronix.de> | 2009-12-30 15:37:20 +0100 |
|---|---|---|
| committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2010-04-23 13:52:31 +0200 |
| commit | a4382d43f50eee136f59411183c3d874b7fade4b (patch) | |
| tree | 70f355e8b6153dba2af1a592b59523dccfa51ed6 /patches/dbus-1.2.24 | |
| parent | 8ecc443cd0ce4f511d86b18b3d46bbe8bcdcd7f0 (diff) | |
| download | ptxdist-a4382d43f50eee136f59411183c3d874b7fade4b.tar.gz ptxdist-a4382d43f50eee136f59411183c3d874b7fade4b.tar.xz | |
[host-dbus] fix for installing to pkgdir
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
Diffstat (limited to 'patches/dbus-1.2.24')
| -rw-r--r-- | patches/dbus-1.2.24/make-pkgconfig-file-relocatable.diff | 39 | ||||
| -rw-r--r-- | patches/dbus-1.2.24/series | 1 |
2 files changed, 40 insertions, 0 deletions
diff --git a/patches/dbus-1.2.24/make-pkgconfig-file-relocatable.diff b/patches/dbus-1.2.24/make-pkgconfig-file-relocatable.diff new file mode 100644 index 000000000..1757b4ba6 --- /dev/null +++ b/patches/dbus-1.2.24/make-pkgconfig-file-relocatable.diff @@ -0,0 +1,39 @@ +From: Michael Olbrich <m.olbrich@pengutronix.de> +Subject: make dbus-1.pc relocatable + +Don't use expanded paths in dbus-1.pc.in + +Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de> +--- + configure.in | 2 +- + dbus-1.pc.in | 4 ++-- + 2 files changed, 3 insertions(+), 3 deletions(-) + +Index: b/configure.in +=================================================================== +--- a/configure.in ++++ b/configure.in +@@ -1330,7 +1330,7 @@ AC_DEFINE_UNQUOTED(DBUS_DATADIR,"$DBUS_D + + #### 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 + fi +Index: b/dbus-1.pc.in +=================================================================== +--- a/dbus-1.pc.in ++++ b/dbus-1.pc.in +@@ -3,8 +3,8 @@ exec_prefix=@exec_prefix@ + 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 ++sysconfdir=@sysconfdir@ ++session_bus_services_dir=@datadir@/dbus-1/services + daemondir=@DBUS_DAEMONDIR@ + + Name: dbus diff --git a/patches/dbus-1.2.24/series b/patches/dbus-1.2.24/series index 430010de0..b40f40483 100644 --- a/patches/dbus-1.2.24/series +++ b/patches/dbus-1.2.24/series @@ -1,2 +1,3 @@ 0001-dbus-daemon-launch-helper-fix-build-with-libxml.patch 0002-dbus-change-DBUS_MACHINE_UUID_FILE-path.patch +make-pkgconfig-file-relocatable.diff |