0020-sysdeps-gnu-configure.ac-Set-libc_cv_rootsbindir-onl.patch 1.2 KB

12345678910111213141516171819202122232425262728293031323334353637383940
  1. From 3b5b6079512af8af50d0a43d4c1c218f5ba1b302 Mon Sep 17 00:00:00 2001
  2. From: Khem Raj <raj.khem@gmail.com>
  3. Date: Wed, 18 Mar 2015 00:27:10 +0000
  4. Subject: [PATCH] sysdeps/gnu/configure.ac: Set libc_cv_rootsbindir only if its
  5. empty
  6. This ensures that it can be set in build environment
  7. Upstream-Status: Pending
  8. Signed-off-by: Matthieu Crapet <Matthieu.Crapet@ingenico.com>
  9. Signed-off-by: Khem Raj <raj.khem@gmail.com>
  10. ---
  11. sysdeps/gnu/configure | 2 +-
  12. sysdeps/gnu/configure.ac | 2 +-
  13. 2 files changed, 2 insertions(+), 2 deletions(-)
  14. diff --git a/sysdeps/gnu/configure b/sysdeps/gnu/configure
  15. index c15d1087e8..d30d6e37ae 100644
  16. --- a/sysdeps/gnu/configure
  17. +++ b/sysdeps/gnu/configure
  18. @@ -32,6 +32,6 @@ case "$prefix" in
  19. else
  20. libc_cv_localstatedir=$localstatedir
  21. fi
  22. - libc_cv_rootsbindir=/sbin
  23. + libc_cv_rootsbindir=${libc_cv_rootsbindir:=/sbin}
  24. ;;
  25. esac
  26. diff --git a/sysdeps/gnu/configure.ac b/sysdeps/gnu/configure.ac
  27. index 634fe4de2a..492112e0fd 100644
  28. --- a/sysdeps/gnu/configure.ac
  29. +++ b/sysdeps/gnu/configure.ac
  30. @@ -21,6 +21,6 @@ case "$prefix" in
  31. else
  32. libc_cv_localstatedir=$localstatedir
  33. fi
  34. - libc_cv_rootsbindir=/sbin
  35. + libc_cv_rootsbindir=${libc_cv_rootsbindir:=/sbin}
  36. ;;
  37. esac