Commit c5b6949d authored by Simon McVittie's avatar Simon McVittie Committed by Ray Strode

Add a --with-run-dir which sets the default for everything in [/var]/run

Distributions that don't like /var/run can override this to
/run/gdm; distributions where the directory differs (like Debian,
which uses /run/gdm3) can override this and it'll affect everything.

https://bugzilla.gnome.org/show_bug.cgi?id=692733
parent 5ebfd52b
......@@ -1348,6 +1348,22 @@ AS_AC_EXPAND(SBINDIR, $sbindir)
AS_AC_EXPAND(LIBDIR, $libdir)
AS_AC_EXPAND(LIBEXECDIR, $libexecdir)
dnl ---------------------------------------------------------------------------
dnl - runtime directory
dnl ---------------------------------------------------------------------------
AC_ARG_WITH([run-dir],
AS_HELP_STRING([--with-run-dir=<file>],
[runtime directory]))
if ! test -z "$with_run_dir"; then
GDM_RUN_DIR=$with_run_dir
else
GDM_RUN_DIR=${localstatedir}/gdm
fi
AC_SUBST([GDM_RUN_DIR])
dnl ---------------------------------------------------------------------------
dnl - PID file
dnl ---------------------------------------------------------------------------
......@@ -1359,7 +1375,7 @@ AC_ARG_WITH(pid-file,
if ! test -z "$with_pid_file"; then
GDM_PID_FILE=$with_pid_file
else
GDM_PID_FILE=/var/run/gdm.pid
GDM_PID_FILE=$GDM_RUN_DIR/gdm.pid
fi
AC_SUBST(GDM_PID_FILE)
......@@ -1376,7 +1392,7 @@ AC_ARG_WITH(ran-once-marker-directory,
if ! test -z "$with_ran_once_marker_directory"; then
GDM_RAN_ONCE_MARKER_DIR=$with_ran_once_marker_directory
else
GDM_RAN_ONCE_MARKER_DIR=${localstatedir}/run/gdm
GDM_RAN_ONCE_MARKER_DIR=$GDM_RUN_DIR
fi
AC_SUBST(GDM_RAN_ONCE_MARKER_DIR)
AS_AC_EXPAND(GDM_RAN_ONCE_MARKER_DIR_EXPANDED, $GDM_RAN_ONCE_MARKER_DIR)
......@@ -1414,7 +1430,7 @@ AC_ARG_WITH(xauth-dir,
if ! test -z "$with_xauth_dir"; then
GDM_XAUTH_DIR=$with_xauth_dir
else
GDM_XAUTH_DIR=${localstatedir}/run/gdm
GDM_XAUTH_DIR=$GDM_RUN_DIR
fi
AC_SUBST(GDM_XAUTH_DIR)
......@@ -1430,7 +1446,7 @@ AC_ARG_WITH(screenshot-dir,
if ! test -z "$with_screenshot_dir"; then
GDM_SCREENSHOT_DIR=$with_screenshot_dir
else
GDM_SCREENSHOT_DIR=${localstatedir}/run/gdm/greeter
GDM_SCREENSHOT_DIR=$GDM_RUN_DIR/greeter
fi
AC_SUBST(GDM_SCREENSHOT_DIR)
......
......@@ -16,6 +16,7 @@ AM_CPPFLAGS = \
-DLOGDIR=\"$(logdir)\" \
-DSBINDIR=\"$(sbindir)\" \
-DGNOMELOCALEDIR=\""$(datadir)/locale"\" \
-DGDM_RUN_DIR=\"$(GDM_RUN_DIR)\" \
-DGDM_XAUTH_DIR=\"$(GDM_XAUTH_DIR)\" \
-DGDM_SCREENSHOT_DIR=\"$(GDM_SCREENSHOT_DIR)\" \
-DGDM_CACHE_DIR=\""$(localstatedir)/cache/gdm"\" \
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment