Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 1 | From 5105fedd7fa13dadd2d0d864fb77873b83b79a4b Mon Sep 17 00:00:00 2001 |
| 2 | From: Koen Kooi <koen@dominion.thruhere.net> |
| 3 | Date: Thu, 23 Jun 2011 13:52:09 +0200 |
| 4 | Subject: [PATCH] buildsys: hardcode socketdir to /tmp |
| 5 | |
| 6 | the TMPDIR env var isn't always pointing to the right target path |
| 7 | |
| 8 | Upstream-Status: Inappropriate [embedded] |
| 9 | |
| 10 | Signed-off-by: Koen Kooi <koen@dominion.thruhere.net> |
| 11 | |
| 12 | Original comment: |
| 13 | |
| 14 | avoid to check tmp dir at build time. instead uses hard coded /tmp here |
| 15 | comment added by Kevin Tian <kevin.tian@intel.com> |
| 16 | --- |
| 17 | configure.ac | 11 +---------- |
| 18 | 1 files changed, 1 insertions(+), 10 deletions(-) |
| 19 | |
| 20 | diff --git a/configure.ac b/configure.ac |
| 21 | index 408054b..6d26180 100644 |
| 22 | --- a/configure.ac |
| 23 | +++ b/configure.ac |
| 24 | @@ -1483,16 +1483,7 @@ AC_SUBST(TEST_LAUNCH_HELPER_BINARY) |
| 25 | AC_DEFINE_UNQUOTED(DBUS_TEST_LAUNCH_HELPER_BINARY, "$TEST_LAUNCH_HELPER_BINARY", |
| 26 | [Full path to the launch helper test program in the builddir]) |
| 27 | |
| 28 | -#### Find socket directories |
| 29 | -if ! test -z "$TMPDIR" ; then |
| 30 | - DEFAULT_SOCKET_DIR=$TMPDIR |
| 31 | -elif ! test -z "$TEMP" ; then |
| 32 | - DEFAULT_SOCKET_DIR=$TEMP |
| 33 | -elif ! test -z "$TMP" ; then |
| 34 | - DEFAULT_SOCKET_DIR=$TMP |
| 35 | -else |
| 36 | - DEFAULT_SOCKET_DIR=/tmp |
| 37 | -fi |
| 38 | +DEFAULT_SOCKET_DIR=/tmp |
| 39 | |
| 40 | DEFAULT_SOCKET_DIR=`echo $DEFAULT_SOCKET_DIR | sed 's/+/%2B/g'` |
| 41 | |
| 42 | -- |
| 43 | 1.6.6.1 |
| 44 | |