summaryrefslogtreecommitdiff
path: root/configure.in
diff options
context:
space:
mode:
authorFridrich Štrba <fridrich.strba@bluewin.ch>2010-04-21 10:42:06 +0200
committerRalf Habacker <ralf.habacker@freenet.de>2010-04-21 12:30:52 +0200
commited79e030ca4a3d87803b5f4789941fd63fb84444 (patch)
tree786579d635be63fb3631fe0bed3c2177071db514 /configure.in
parent14cc116254abfb7e49069f143322f2869eea5a83 (diff)
downloaddbus-ed79e030ca4a3d87803b5f4789941fd63fb84444.tar.gz
Patch relocating "exec" variable and position of service files
Diffstat (limited to 'configure.in')
-rw-r--r--configure.in8
1 files changed, 7 insertions, 1 deletions
diff --git a/configure.in b/configure.in
index 74f6f5e7..4bc50e7a 100644
--- a/configure.in
+++ b/configure.in
@@ -1335,6 +1335,7 @@ AC_MSG_RESULT(yes)
#### find the actual value for $prefix that we'll end up with
## (I know this is broken and should be done in the Makefile, but
## that's a major pain and almost nobody actually seems to care)
+AS_AC_EXPAND(EXPANDED_PREFIX, "$prefix")
AS_AC_EXPAND(EXPANDED_LOCALSTATEDIR, "$localstatedir")
AS_AC_EXPAND(EXPANDED_SYSCONFDIR, "$sysconfdir")
AS_AC_EXPAND(EXPANDED_BINDIR, "$bindir")
@@ -1430,6 +1431,11 @@ fi
AC_SUBST(DBUS_USER)
AC_DEFINE_UNQUOTED(DBUS_USER,"$DBUS_USER", [User for running the system BUS daemon])
+#### Prefix to install into
+DBUS_PREFIX=$EXPANDED_PREFIX
+AC_SUBST(DBUS_PREFIX)
+AC_DEFINE_UNQUOTED(DBUS_PREFIX,"$DBUS_PREFIX", [Prefix for installing DBUS])
+
#### Direcotry to install data files into
DBUS_DATADIR=$EXPANDED_DATADIR
AC_SUBST(DBUS_DATADIR)
@@ -1581,7 +1587,7 @@ echo "
D-Bus $VERSION
==============
- prefix: ${prefix}
+ prefix: ${EXPANDED_PREFIX}
exec_prefix: ${exec_prefix}
libdir: ${EXPANDED_LIBDIR}
libexecdir: ${EXPANDED_LIBEXECDIR}