diff options
| author | Brian Cameron <bcameron@src.gnome.org> | 2002-07-11 10:44:19 +0000 |
|---|---|---|
| committer | Brian Cameron <bcameron@src.gnome.org> | 2002-07-11 10:44:19 +0000 |
| commit | 497ce4591a41dc65699aa3aae640ce448c464ed2 (patch) | |
| tree | 3fee56bed699d0928c1014935b236f76c00f94dd | |
| parent | 851bb987f194e06f1031b47db13d2ce0ca36ffbd (diff) | |
| download | gconf-497ce4591a41dc65699aa3aae640ce448c464ed2.tar.gz | |
gconf-2.0.pc.in gconf.spec.in gconf/Makefile.am gconf/gconfd.c
* gconf-2.0.pc.in
* gconf.spec.in
* gconf/Makefile.am
* gconf/gconfd.c
* gconf/gconf-internals
Now install gconfd-2 and gconf-sanity-check-2 in libexec
| -rw-r--r-- | ChangeLog | 9 | ||||
| -rw-r--r-- | gconf-2.0.pc.in | 1 | ||||
| -rw-r--r-- | gconf.spec.in | 2 | ||||
| -rw-r--r-- | gconf/Makefile.am | 4 | ||||
| -rw-r--r-- | gconf/gconf-internals.c | 2 | ||||
| -rw-r--r-- | gconf/gconfd.c | 4 |
6 files changed, 17 insertions, 5 deletions
@@ -1,3 +1,12 @@ +2002-07-11 Brian Cameron <Brian.Cameron@sun.ie> + + * gconf-2.0.pc.in + * gconf.spec.in + * gconf/Makefile.am + * gconf/gconfd.c + * gconf/gconf-internals + Now install gconfd-2 and gconf-sanity-check-2 in libexec + 2002-07-09 Mark McLoughlin <mark@skynet.ie> * gconf/gconfd.c: (obtain_database): fix diff --git a/gconf-2.0.pc.in b/gconf-2.0.pc.in index 475ce373..04c3003f 100644 --- a/gconf-2.0.pc.in +++ b/gconf-2.0.pc.in @@ -2,6 +2,7 @@ prefix=@prefix@ exec_prefix=@exec_prefix@ libdir=@libdir@ includedir=@includedir@ +gconf_serverdir=@libexecdir@ Name: gconf diff --git a/gconf.spec.in b/gconf.spec.in index 439a9ddb..1774e538 100644 --- a/gconf.spec.in +++ b/gconf.spec.in @@ -92,7 +92,7 @@ rm -rf $RPM_BUILD_ROOT %config(noreplace) %{sysconfdir}/gconf/schemas/*.schemas %dir %{sysconfdir}/gconf/gconf.xml.defaults %dir %{sysconfdir}/gconf/gconf.xml.mandatory -%{prefix}/bin/gconfd-2 +%{prefix}/libexec/gconfd-2 %{prefix}/bin/gconftool %{prefix}/bin/gconftool-2 %{prefix}/lib/lib*.so.* diff --git a/gconf/Makefile.am b/gconf/Makefile.am index 485d13c9..a2ded885 100644 --- a/gconf/Makefile.am +++ b/gconf/Makefile.am @@ -12,6 +12,7 @@ INCLUDES= \ -DGCONF_CONFDIR=\""$(sysconfdir)/gconf/$(MAJOR_VERSION)"\" \ -DGCONF_ETCDIR=\""$(sysconfdir)/gconf"\" \ -DGCONF_BINDIR=\""$(bindir)"\" \ + -DGCONF_SERVERDIR=\""$(libexecdir)"\" \ -DGCONF_BUILDDIR=\""$(top_builddir)"\" \ -DGCONF_BACKEND_DIR=\""$(pkglibdir)/$(MAJOR_VERSION)"\" \ -DVERSION=\""$(VERSION)"\" \ @@ -29,7 +30,8 @@ endif lib_LTLIBRARIES = libgconf-2.la -bin_PROGRAMS = gconfd-2 gconftool-2 $(SANITY_CHECK) +bin_PROGRAMS = gconftool-2 +libexec_PROGRAMS = gconfd-2 $(SANITY_CHECK) CORBA_SOURCECODE = GConf-common.c GConf-skels.c GConf-stubs.c GConf.h diff --git a/gconf/gconf-internals.c b/gconf/gconf-internals.c index cf63b0bc..0e28a8bf 100644 --- a/gconf/gconf-internals.c +++ b/gconf/gconf-internals.c @@ -2860,7 +2860,7 @@ gconf_activate_server (gboolean start_if_not_found, goto out; } - argv[0] = g_strconcat (GCONF_BINDIR, "/" GCONFD, NULL); + argv[0] = g_strconcat (GCONF_SERVERDIR, "/" GCONFD, NULL); argv[1] = g_strdup_printf ("%d", p[1]); argv[2] = NULL; diff --git a/gconf/gconfd.c b/gconf/gconfd.c index 328f5c64..c790b052 100644 --- a/gconf/gconfd.c +++ b/gconf/gconfd.c @@ -2363,11 +2363,11 @@ gconf_handle_segv (int signum) /* Child process */ execl (GCONF_BINDIR "/gnome_segv2", GCONF_BINDIR "/gnome_segv2", - GCONFD, buf, + GCONF_SERVERDIR"/"GCONFD, buf, VERSION, NULL); execlp ("gnome_segv2", "gnome_segv2", - GCONFD, buf, + GCONF_SERVERDIR"/"GCONFD, buf, GCONFD, NULL); _exit (99); |