Merge authors:
  James Hunt (jamesodhunt)
Related merge proposals:
  https://code.launchpad.net/~jamesodhunt/upstart/bug-1122510/+merge/151464
  proposed by: James Hunt (jamesodhunt)
  review: Approve - Dmitrijs Ledkovs (xnox)
------------------------------------------------------------
revno: 1444 [merge]
committer: James Hunt <[email protected]>
branch nick: upstart
timestamp: Mon 2013-03-04 11:25:22 +0000
message:
  * Merge of lp:~jamesodhunt/upstart/bug-1122510.
modified:
  ChangeLog
  configure.ac


--
lp:upstart
https://code.launchpad.net/~upstart-devel/upstart/trunk

Your team Upstart Reviewers is subscribed to branch lp:upstart.
To unsubscribe from this branch go to 
https://code.launchpad.net/~upstart-devel/upstart/trunk/+edit-subscription
=== modified file 'ChangeLog'
--- ChangeLog	2013-03-04 09:55:23 +0000
+++ ChangeLog	2013-03-04 11:12:19 +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:12:19 +0000
@@ -81,7 +81,7 @@
 AC_MSG_CHECKING([whether to include sbindir in PATH])
 eval upstart_sbindir=\"$sbindir\"
 case $upstart_sbindir in
-    /sbin|//sbin|/usr/sbin|/usr/local/sbin)
+    /sbin|NONE/sbin|//sbin|/usr/sbin|/usr/local/sbin)
     	AC_MSG_RESULT([no])
 	;;
     *)

-- 
upstart-devel mailing list
[email protected]
Modify settings or unsubscribe at: 
https://lists.ubuntu.com/mailman/listinfo/upstart-devel

Reply via email to