| Andrew Geissler | 7e0e3c0 | 2022-02-25 20:34:39 +0000 | [diff] [blame^] | 1 | From 5d1384d86fc44404ca32c6fda2d46ec357337c91 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 empty |
| 5 | |
| 6 | This ensures that it can be set in build environment |
| 7 | |
| 8 | Upstream-Status: Submitted [https://patchwork.sourceware.org/project/glibc/patch/20211209203557.1318333-2-raj.khem@gmail.com/] |
| 9 | Signed-off-by: Matthieu Crapet <Matthieu.Crapet@ingenico.com> |
| 10 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
| 11 | --- |
| 12 | sysdeps/gnu/configure | 2 +- |
| 13 | sysdeps/gnu/configure.ac | 2 +- |
| 14 | 2 files changed, 2 insertions(+), 2 deletions(-) |
| 15 | |
| 16 | diff --git a/sysdeps/gnu/configure b/sysdeps/gnu/configure |
| 17 | index c15d1087e8..d30d6e37ae 100644 |
| 18 | --- a/sysdeps/gnu/configure |
| 19 | +++ b/sysdeps/gnu/configure |
| 20 | @@ -32,6 +32,6 @@ case "$prefix" in |
| 21 | else |
| 22 | libc_cv_localstatedir=$localstatedir |
| 23 | fi |
| 24 | - libc_cv_rootsbindir=/sbin |
| 25 | + libc_cv_rootsbindir=${libc_cv_rootsbindir:=/sbin} |
| 26 | ;; |
| 27 | esac |
| 28 | diff --git a/sysdeps/gnu/configure.ac b/sysdeps/gnu/configure.ac |
| 29 | index 634fe4de2a..492112e0fd 100644 |
| 30 | --- a/sysdeps/gnu/configure.ac |
| 31 | +++ b/sysdeps/gnu/configure.ac |
| 32 | @@ -21,6 +21,6 @@ case "$prefix" in |
| 33 | else |
| 34 | libc_cv_localstatedir=$localstatedir |
| 35 | fi |
| 36 | - libc_cv_rootsbindir=/sbin |
| 37 | + libc_cv_rootsbindir=${libc_cv_rootsbindir:=/sbin} |
| 38 | ;; |
| 39 | esac |