diff options
| author | Roland McGrath <roland@gnu.org> | 2006-04-04 07:32:53 +0000 |
|---|---|---|
| committer | Roland McGrath <roland@gnu.org> | 2006-04-04 07:32:53 +0000 |
| commit | 729f7b28c598e1623c5bba3495e1447342ffc82d (patch) | |
| tree | 2c9ac3957768a0bfbb6bb93e71de78c192596bcc | |
| parent | 82f0f9ed70d5391f2134962cfc052013740da96a (diff) | |
| download | glibc-729f7b28c598e1623c5bba3495e1447342ffc82d.tar.gz glibc-729f7b28c598e1623c5bba3495e1447342ffc82d.tar.xz glibc-729f7b28c598e1623c5bba3495e1447342ffc82d.zip | |
[BZ #2508]
* nscd/Makefile ($(objpfx)nscd_stat.o: sysincludes): Move setting inside [$(have-selinux) = yes]. ($(objpfx)selinux.o: sysincludes): Likewise.
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | nscd/Makefile | 9 |
2 files changed, 10 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog index 74cc0e9394..7235b2f597 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,10 @@ 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. (generate-8bit-gap-table): Likewise. ($(objpfx)iso8859-7jp.stmp): Likewise. diff --git a/nscd/Makefile b/nscd/Makefile index e91c289a4f..0b35964e7b 100644 --- a/nscd/Makefile +++ b/nscd/Makefile @@ -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. # The GNU C Library is free software; you can redistribute it and/or @@ -58,9 +59,6 @@ endif nscd-modules += selinux selinux-LIBS := -lselinux $(libaudit) -endif - -LDLIBS-nscd = $(selinux-LIBS) # The configure.in check for libselinux and its headers did not use # $SYSINCLUDES. The directory specified by --with-headers usually @@ -69,6 +67,9 @@ LDLIBS-nscd = $(selinux-LIBS) # system headers will be ok for this file. $(objpfx)nscd_stat.o: sysincludes = # nothing $(objpfx)selinux.o: sysincludes = # nothing +endif + +LDLIBS-nscd = $(selinux-LIBS) distribute := nscd.h nscd-client.h dbg_log.h \ $(addsuffix .c, $(filter-out xmalloc,$(all-nscd-modules))) \ |