diff options
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rwxr-xr-x | SystemToolsBackends.pl.in | 2 | ||||
| -rw-r--r-- | Utils/Backend.pm | 3 | ||||
| -rw-r--r-- | configure.in | 4 |
4 files changed, 14 insertions, 1 deletions
@@ -1,3 +1,9 @@ +2006-11-17 Carlos Garnacho <carlosg@gnome.org> + + * configure.in: expand localstatedir + * SystemToolsBackends.pl.in, Utils/Backend.pm: use localstatedir + passed by configure to write pidfile. + 2006-11-15 Carlos Garnacho <carlosg@gnome.org> * Shares/NFS.pm (get_share_client_info): Do not reset $rw if it finds diff --git a/SystemToolsBackends.pl.in b/SystemToolsBackends.pl.in index 954b0a8..f49ea62 100755 --- a/SystemToolsBackends.pl.in +++ b/SystemToolsBackends.pl.in @@ -24,6 +24,8 @@ use lib "@scriptsdir@"; use lib "@netdbusdir@"; +our $localstatedir = "@localstatedir@"; + BEGIN { my $i = 0; diff --git a/Utils/Backend.pm b/Utils/Backend.pm index 2a6d28c..98810b3 100644 --- a/Utils/Backend.pm +++ b/Utils/Backend.pm @@ -28,6 +28,7 @@ use Utils::XML; our $DBUS_PREFIX = "org.freedesktop.SystemToolsBackends"; our $DBUS_PATH = "/org/freedesktop/SystemToolsBackends"; +our $localstatedir; our $tool; eval "use Locale::gettext"; @@ -317,7 +318,7 @@ sub daemonize setsid or die "Can't start a new session: $!"; # write pid file - open (PIDFILE, ">/var/run/system-tools-backends.pid") or die "Can't open pidfile"; + open (PIDFILE, ">$main::localstatedir/run/system-tools-backends.pid"); print PIDFILE $$; close (PIDFILE); } diff --git a/configure.in b/configure.in index 918c42f..6b45b0a 100644 --- a/configure.in +++ b/configure.in @@ -40,6 +40,10 @@ SYSCONFDIR_TMP="${sysconfdir}" AC_EXPAND(sysconfdir,"NONE",EXPANDED_SYSCONFDIR) AC_SUBST(EXPANDED_SYSCONFDIR) +LOCALSTATEDIR_TMP="${localsatedir}" +AC_EXPAND(localstatedir, "NONE", localstatedir) +AC_SUBST(localstatedir) + dnl scriptsdir & filesdir scriptsdir="${EXPANDED_DATADIR}/system-tools-backends-2.0/scripts" filesdir="${EXPANDED_DATADIR}/system-tools-backends-2.0/files" |