[git commit master] ftw.h installation: fix inverted logic
Peter Kjellerstedt
peter.kjellerstedt at axis.com
Fri Feb 5 09:24:39 UTC 2010
> -----Original Message-----
> From: uclibc-cvs-bounces at uclibc.org [mailto:uclibc-cvs-
> bounces at uclibc.org] On Behalf Of Bernhard Reutner-Fischer
> Sent: den 23 januari 2010 22:37
> To: uclibc-cvs at uclibc.org
> Subject: [git commit master] ftw.h installation: fix inverted logic
>
> commit:
> http://git.uclibc.org/uClibc/commit/?id=d75f980f379dfbbe70ae8fb0956693a95af2fca2
> branch: http://git.uclibc.org/uClibc/commit/?id=refs/heads/master
>
> Signed-off-by: Bernhard Reutner-Fischer <rep.dot.nop at gmail.com>
> ---
> Makefile.in | 2 +-
> 1 files changed, 1 insertions(+), 1 deletions(-)
>
> diff --git a/Makefile.in b/Makefile.in
> index 39dd18c..879b730 100644
> --- a/Makefile.in
> +++ b/Makefile.in
> @@ -262,7 +262,7 @@ HEADERS_RM-$(UCLIBC_HAS_BSD_ERR) +=
> err.h
> HEADERS_RM-$(UCLIBC_HAS_CRYPT) += crypt.h
> HEADERS_RM-$(UCLIBC_HAS_EPOLL) += sys/epoll.h
> HEADERS_RM-$(UCLIBC_HAS_FENV) += fenv.h bits/fenv.h bits/fenvinline.h
> -HEADERS_RM-$(findstring y,$(UCLIBC_HAS_FTW)$(UCLIBC_HAS_NFTW)) += ftw.h
> +HEADERS_RM-$(if $(findstring y,$(UCLIBC_HAS_FTW)$(UCLIBC_HAS_NFTW)),,y) += ftw.h
I may of course be reading the test above incorrectly, but as
far as I can deduct, the above code will prevent ftw.h from
being installed if $(UCLIBC_HAS_FTW) and/or $(UCLIBC_HAS_NFTW)
is y. This seems wrong. I would have assumed the following to
be what you want:
HEADERS_RM-$(UCLIBC_HAS_FTW)$(UCLIBC_HAS_NFTW) += ftw.h
Remember that it is $(HEADERS_RM-) that is later used to actually
remove the unwanted include files.
> HEADERS_RM-$(UCLIBC_HAS_GETTEXT_AWARENESS) += libintl.h
> HEADERS_RM-$(UCLIBC_HAS_GLIBC_CUSTOM_PRINTF) += printf.h
> HEADERS_RM-$(UCLIBC_HAS_GLOB) += glob.h
//Peter
More information about the uClibc
mailing list