diff options
| author | Tanu Kaskinen <tanuk@iki.fi> | 2009-10-02 17:24:44 +0300 |
|---|---|---|
| committer | Tanu Kaskinen <tanuk@iki.fi> | 2009-10-02 17:24:44 +0300 |
| commit | 019331d25b6af107fb8cacc3ada552e7567a64bf (patch) | |
| tree | d5545e795e164fb6cd8edae1a45e7b8bb966ee12 /src/modules/gconf/module-gconf.c | |
| parent | 587131917f9129c8347c789febb7e755dfb091de (diff) | |
| parent | afd1b6d355ef1a41cb3592485855e273a5de69c1 (diff) | |
Merge branch 'master' into dbus-work
Conflicts:
src/daemon/daemon-conf.c
Diffstat (limited to 'src/modules/gconf/module-gconf.c')
| -rw-r--r-- | src/modules/gconf/module-gconf.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/modules/gconf/module-gconf.c b/src/modules/gconf/module-gconf.c index 85523b39..5f31d688 100644 --- a/src/modules/gconf/module-gconf.c +++ b/src/modules/gconf/module-gconf.c @@ -342,7 +342,7 @@ int pa__init(pa_module*m) { if ((u->fd = pa_start_child_for_read( #if defined(__linux__) && !defined(__OPTIMIZE__) - pa_run_from_build_tree() ? PA_BUILDDIR "/.libs/gconf-helper" : + pa_run_from_build_tree() ? PA_BUILDDIR "/gconf-helper" : #endif PA_GCONF_HELPER, NULL, &u->pid)) < 0) goto fail; |