James Hunt has proposed merging lp:~jamesodhunt/upstart/bug-1122510 into lp:upstart.
Requested reviews: Upstart Reviewers (upstart-reviewers) For more details, see: https://code.launchpad.net/~jamesodhunt/upstart/bug-1122510/+merge/151462 * configure.ac: Only add sbin to path if exec_prefix specified (LP: #1122510). -- https://code.launchpad.net/~jamesodhunt/upstart/bug-1122510/+merge/151462 Your team Upstart Reviewers is requested to review the proposed merge of lp:~jamesodhunt/upstart/bug-1122510 into lp:upstart.
=== modified file 'ChangeLog' --- ChangeLog 2013-03-04 09:55:23 +0000 +++ ChangeLog 2013-03-04 11:02:23 +0000 @@ -1,5 +1,10 @@ 2013-03-04 James Hunt <[email protected]> + * configure.ac: Only add sbin to path if exec_prefix specified + (LP: #1122510). + +2013-03-04 James Hunt <[email protected]> + * init/session.c: session_from_dbus(): Fixed off-by-one readlink error. === modified file 'configure.ac' --- configure.ac 2012-12-07 21:39:17 +0000 +++ configure.ac 2013-03-04 11:02:23 +0000 @@ -79,15 +79,22 @@ # Other checks AC_MSG_CHECKING([whether to include sbindir in PATH]) -eval upstart_sbindir=\"$sbindir\" +if test x$exec_prefix != x && test x$exec_prefix != xNONE; then + eval upstart_sbindir=\"$sbindir\" +fi case $upstart_sbindir in /sbin|//sbin|/usr/sbin|/usr/local/sbin) AC_MSG_RESULT([no]) ;; *) - AC_MSG_RESULT([yes]) - AC_DEFINE_UNQUOTED([EXTRA_PATH], ["$upstart_sbindir"], - [Directory to append to path.]) + if test x$upstart_sbindir = x + then + AC_MSG_RESULT([no]) + else + AC_MSG_RESULT([yes]) + AC_DEFINE_UNQUOTED([EXTRA_PATH], ["$upstart_sbindir"], + [Directory to append to path.]) + fi ;; esac
-- upstart-devel mailing list [email protected] Modify settings or unsubscribe at: https://lists.ubuntu.com/mailman/listinfo/upstart-devel
