diff options
Diffstat (limited to 'meta/recipes-core/util-linux/util-linux/configure-sbindir.patch')
-rw-r--r-- | meta/recipes-core/util-linux/util-linux/configure-sbindir.patch | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/meta/recipes-core/util-linux/util-linux/configure-sbindir.patch b/meta/recipes-core/util-linux/util-linux/configure-sbindir.patch index f1f5ef4e4f..a5b1ff12e5 100644 --- a/meta/recipes-core/util-linux/util-linux/configure-sbindir.patch +++ b/meta/recipes-core/util-linux/util-linux/configure-sbindir.patch | |||
@@ -1,18 +1,23 @@ | |||
1 | util-linux: take ${sbindir} from the environment if it is set there | 1 | util-linux: take ${sbindir} from the environment if it is set there |
2 | fix the test, the [ ] syntax was getting eaten by autoconf | ||
2 | 3 | ||
3 | Signed-off-by: Phil Blundell <pb@pbcl.net> | 4 | Signed-off-by: Phil Blundell <pb@pbcl.net> |
5 | Signed-off-by: Saul Wold <sgw@linux.intel.com | ||
4 | Upstream-Status: Inappropriate [configuration] | 6 | Upstream-Status: Inappropriate [configuration] |
5 | 7 | ||
6 | --- util-linux-2.21.2/configure.ac~ 2012-09-22 09:29:12.354215377 +0100 | 8 | Index: util-linux-2.22.1/configure.ac |
7 | +++ util-linux-2.21.2/configure.ac 2012-09-22 16:47:14.713628946 +0100 | 9 | =================================================================== |
8 | @@ -67,7 +67,9 @@ | 10 | --- util-linux-2.22.1.orig/configure.ac |
11 | +++ util-linux-2.22.1/configure.ac | ||
12 | @@ -73,7 +73,10 @@ AC_SUBST([localstatedir]) | ||
9 | usrbin_execdir='${exec_prefix}/bin' | 13 | usrbin_execdir='${exec_prefix}/bin' |
10 | AC_SUBST([usrbin_execdir]) | 14 | AC_SUBST([usrbin_execdir]) |
11 | 15 | ||
12 | -usrsbin_execdir='${exec_prefix}/sbin' | 16 | -usrsbin_execdir='${exec_prefix}/sbin' |
13 | +if [ -z "$usrsbin_execdir" ]; then | 17 | +if test -z "$usrsbin_execdir" ; |
18 | +then | ||
14 | + usrsbin_execdir='${exec_prefix}/sbin' | 19 | + usrsbin_execdir='${exec_prefix}/sbin' |
15 | +fi | 20 | +fi |
16 | AC_SUBST([usrsbin_execdir]) | 21 | AC_SUBST([usrsbin_execdir]) |
17 | 22 | ||
18 | usrlib_execdir='${exec_prefix}/'$libdirname | 23 | case $libdir in |