diff options
| author | Colin Walters <walters@verbum.org> | 2011-01-07 13:29:41 -0500 |
|---|---|---|
| committer | Colin Walters <walters@verbum.org> | 2011-01-07 13:29:41 -0500 |
| commit | d71c4ab1cd78afb84334fb3dd85bc2690f2b19ac (patch) | |
| tree | d410b4434e31361671c6e1fb8d9ee3576637a3aa | |
| parent | c73ae87e12bb664511d2303e410f0ec864b8cd0f (diff) | |
| download | dbus-d71c4ab1cd78afb84334fb3dd85bc2690f2b19ac.tar.gz | |
RHEL-4: Import dbus-0.22-servicedir.patch
| -rw-r--r-- | bus/Makefile.am | 2 | ||||
| -rw-r--r-- | bus/session.conf.in | 2 | ||||
| -rw-r--r-- | configure.in | 5 |
3 files changed, 7 insertions, 2 deletions
diff --git a/bus/Makefile.am b/bus/Makefile.am index a9761be5..218c6a5f 100644 --- a/bus/Makefile.am +++ b/bus/Makefile.am @@ -92,7 +92,7 @@ clean-local: install-data-hook: $(mkinstalldirs) $(DESTDIR)/$(localstatedir)/run/dbus $(mkinstalldirs) $(DESTDIR)/$(configdir)/system.d - $(mkinstalldirs) $(DESTDIR)/$(libdir)/dbus-1.0/services + $(mkinstalldirs) $(DESTDIR)/$(datadir)/dbus-1/services #### Init scripts fun SCRIPT_IN_FILES=messagebus.in diff --git a/bus/session.conf.in b/bus/session.conf.in index 34d2492c..6741f3d1 100644 --- a/bus/session.conf.in +++ b/bus/session.conf.in @@ -10,7 +10,7 @@ <listen>unix:tmpdir=@DBUS_SESSION_SOCKET_DIR@</listen> - <servicedir>@EXPANDED_LIBDIR@/dbus-1.0/services</servicedir> + <servicedir>@EXPANDED_DATADIR@/dbus-1/services</servicedir> <policy context="default"> <!-- Allow everything to be sent --> diff --git a/configure.in b/configure.in index 36494e41..56607e3e 100644 --- a/configure.in +++ b/configure.in @@ -978,6 +978,10 @@ LIBDIR_TMP="$libdir" EXPANDED_LIBDIR=`eval echo $LIBDIR_TMP` AC_SUBST(EXPANDED_LIBDIR) +DATADIR_TMP="$datadir" +EXPANDED_DATADIR=`eval echo $DATADIR_TMP` +AC_SUBST(EXPANDED_DATADIR) + ## put prefix and exec_prefix back prefix=$old_prefix exec_prefix=$old_exec_prefix @@ -1162,6 +1166,7 @@ echo " bindir: ${EXPANDED_BINDIR} sysconfdir: ${EXPANDED_SYSCONFDIR} localstatedir: ${EXPANDED_LOCALSTATEDIR} + datadir: ${EXPANDED_DATADIR} source code location: ${srcdir} compiler: ${CC} cflags: ${CFLAGS} |