mirror of
https://sourceware.org/git/glibc.git
synced 2025-01-05 09:01:07 +00:00
[BZ #2508]
* nscd/Makefile ($(objpfx)nscd_stat.o: sysincludes): Move setting inside [$(have-selinux) = yes]. ($(objpfx)selinux.o: sysincludes): Likewise.
This commit is contained in:
parent
82f0f9ed70
commit
729f7b28c5
@ -1,5 +1,10 @@
|
|||||||
2006-04-04 Roland McGrath <roland@redhat.com>
|
2006-04-04 Roland McGrath <roland@redhat.com>
|
||||||
|
|
||||||
|
[BZ #2508]
|
||||||
|
* nscd/Makefile ($(objpfx)nscd_stat.o: sysincludes): Move setting
|
||||||
|
inside [$(have-selinux) = yes].
|
||||||
|
($(objpfx)selinux.o: sysincludes): Likewise.
|
||||||
|
|
||||||
* iconvdata/Makefile (generate-8bit-table): Use LC_ALL=C.
|
* iconvdata/Makefile (generate-8bit-table): Use LC_ALL=C.
|
||||||
(generate-8bit-gap-table): Likewise.
|
(generate-8bit-gap-table): Likewise.
|
||||||
($(objpfx)iso8859-7jp.stmp): Likewise.
|
($(objpfx)iso8859-7jp.stmp): Likewise.
|
||||||
|
@ -1,4 +1,5 @@
|
|||||||
# Copyright (C) 1998,2000,2002,2003,2004,2005 Free Software Foundation, Inc.
|
# Copyright (C) 1998,2000,2002,2003,2004,2005,2006
|
||||||
|
# Free Software Foundation, Inc.
|
||||||
# This file is part of the GNU C Library.
|
# This file is part of the GNU C Library.
|
||||||
|
|
||||||
# The GNU C Library is free software; you can redistribute it and/or
|
# The GNU C Library is free software; you can redistribute it and/or
|
||||||
@ -58,9 +59,6 @@ endif
|
|||||||
|
|
||||||
nscd-modules += selinux
|
nscd-modules += selinux
|
||||||
selinux-LIBS := -lselinux $(libaudit)
|
selinux-LIBS := -lselinux $(libaudit)
|
||||||
endif
|
|
||||||
|
|
||||||
LDLIBS-nscd = $(selinux-LIBS)
|
|
||||||
|
|
||||||
# The configure.in check for libselinux and its headers did not use
|
# The configure.in check for libselinux and its headers did not use
|
||||||
# $SYSINCLUDES. The directory specified by --with-headers usually
|
# $SYSINCLUDES. The directory specified by --with-headers usually
|
||||||
@ -69,6 +67,9 @@ LDLIBS-nscd = $(selinux-LIBS)
|
|||||||
# system headers will be ok for this file.
|
# system headers will be ok for this file.
|
||||||
$(objpfx)nscd_stat.o: sysincludes = # nothing
|
$(objpfx)nscd_stat.o: sysincludes = # nothing
|
||||||
$(objpfx)selinux.o: sysincludes = # nothing
|
$(objpfx)selinux.o: sysincludes = # nothing
|
||||||
|
endif
|
||||||
|
|
||||||
|
LDLIBS-nscd = $(selinux-LIBS)
|
||||||
|
|
||||||
distribute := nscd.h nscd-client.h dbg_log.h \
|
distribute := nscd.h nscd-client.h dbg_log.h \
|
||||||
$(addsuffix .c, $(filter-out xmalloc,$(all-nscd-modules))) \
|
$(addsuffix .c, $(filter-out xmalloc,$(all-nscd-modules))) \
|
||||||
|
Loading…
Reference in New Issue
Block a user