This is the mail archive of the
libc-alpha@sourceware.org
mailing list for the glibc project.
Re: [PATCH] support: Expose sbindir as support_sbindir_prefix
On 20/05/2019 15:34, Florian Weimer wrote:
> * Adhemerval Zanella:
>
>> On 20/05/2019 14:40, Florian Weimer wrote:
>>> 2019-05-20 Florian Weimer <fweimer@redhat.com>
>>>
>>> * support/support.h (support_sbindir_prefix): Declare.
>>> * support/Makefile (CFLAGS-support_paths.c): Define SBINDIR_PATH.
>>> * support/support_paths.c (support_sbindir_prefix): Define.
>>>
>>> diff --git a/support/Makefile b/support/Makefile
>>> index 18d39f5a50..56c1ed43bb 100644
>>> --- a/support/Makefile
>>> +++ b/support/Makefile
>>> @@ -181,6 +181,7 @@ CFLAGS-support_paths.c = \
>>> -DINSTDIR_PATH=\"$(prefix)\" \
>>> -DLIBDIR_PATH=\"$(libdir)\" \
>>> -DBINDIR_PATH=\"$(bindir)\" \
>>> + -DSBINDIR_PATH=\"$(sbindir)\" \
>>> -DROOTSBINDIR_PATH=\"$(rootsbindir)\"
>>>
>>> ifeq (,$(CXX))
>>> diff --git a/support/support.h b/support/support.h
>>> index 13076b75ba..53271cedf1 100644
>>> --- a/support/support.h
>>> +++ b/support/support.h
>>> @@ -108,6 +108,8 @@ extern const char support_libdir_prefix[];
>>> /* Corresponds to the install's bin/ directory. */
>>> extern const char support_bindir_prefix[];
>>> /* Corresponds to the install's sbin/ directory. */
>>> +extern const char support_sbindir_prefix[];
>>> +/* Corresponds to the install's sbin/ directory. */
>>> extern const char support_install_rootsbindir[];
>>
>> Which is the different between rootsbindir and sbindir? Because we can
>> either use them interchangeable or adjust the rootsbindir comment.
>
> It's the difference between /usr/sbin/iconvconfig (with prefix) and
> /sbin/ldconfig (without).
>
> Not sure what's the proper comment fix is. The other comments do not
> mention the prefix either, but the variable name does. Maybe:
>
> +/* Corresponds to the install's sbin/ directory (without prefix). */
> extern const char support_install_rootsbindir[];
Ok, LGTM.
>
> Thanks,
> Florian
>