From: Roland McGrath <roland@gnu.org>
Date: Fri, 15 Apr 2005 06:33:21 +0000 (+0000)
Subject: [BZ #253]
X-Git-Tag: cvs/fedora-glibc-20050415T0909
X-Git-Url: https://sourceware.org/git/?a=commitdiff_plain;h=c9e169479eac36b4dfd20643c2b33ac13a06a41a;p=glibc.git

[BZ #253]

2005-04-14  Roland McGrath  <roland@redhat.com>
	* MakeTAGS ($P/$(domain).pot): Depend on distinfo file as well.
	(extract): Filter-out distinfo file name.

	[BZ #253]
	* MakeTAGS (text-srcs): Match %.bash.in files too.

	[BZ #253]
	* nscd/Makefile (all-nscd-modules): New variable, include selinux
	module regardless of configuration.
	(distribute): Use that instead of $(nscd-modules).
---

diff --git a/ChangeLog b/ChangeLog
index e9972c5bec..0046323c49 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+2005-04-14  Roland McGrath  <roland@redhat.com>
+
+	* MakeTAGS ($P/$(domain).pot): Depend on distinfo file as well.
+	(extract): Filter-out distinfo file name.
+
+	[BZ #253]
+	* MakeTAGS (text-srcs): Match %.bash.in files too.
+
+	[BZ #253]
+	* nscd/Makefile (all-nscd-modules): New variable, include selinux
+	module regardless of configuration.
+	(distribute): Use that instead of $(nscd-modules).
+
 2005-04-13  David S. Miller  <davem@davemloft.net>
 
 	Add sparc64 TLS and NPTL support.
diff --git a/MakeTAGS b/MakeTAGS
index bee41252ee..fff6851c91 100644
--- a/MakeTAGS
+++ b/MakeTAGS
@@ -1,5 +1,5 @@
 # Make the TAGS files.
-# Copyright (C) 1992,1994,1995,1996,1998,2002,2003
+# Copyright (C) 1992,1994,1995,1996,1998,2002,2003,2005
 #	Free Software Foundation, Inc.
 # This file is part of the GNU C Library.
 
@@ -146,12 +146,13 @@ endif
 define extract
 @rm -f $@.new
 $(XGETTEXT) --keyword=_ --keyword=N_ --add-comments=TRANS  --sort-by-file \
-	    --omit-header -E -n -d - $(XGETTEXTFLAGS-$(@F)) > $@.new $^
+	    --omit-header -E -n -d - $(XGETTEXTFLAGS-$(@F)) > $@.new \
+	    $(filter-out $(objpfx)distinfo,$^)
 mv -f $@.new $@
 endef
 
-text-srcs := $(filter %.c %.h %.cc %.C,$(tags_sources))
-$P/$(domain).pot: $(text-srcs)
+text-srcs := $(filter %.c %.h %.cc %.C %.bash.in,$(tags_sources))
+$P/$(domain).pot: $(objpfx)distinfo $(text-srcs)
 ifeq (,$(text-srcs))
 	cp /dev/null $@
 else
diff --git a/nscd/Makefile b/nscd/Makefile
index 9c32c68681..75a9d434f4 100644
--- a/nscd/Makefile
+++ b/nscd/Makefile
@@ -51,6 +51,7 @@ otherlibs += $(nssobjdir)/libnss_files.a $(resolvobjdir)/libnss_dns.a \
 	     $(resolvobjdir)/libresolv.a
 endif
 
+all-nscd-modules := $(nscd-modules) selinux
 ifeq (yes,$(have-selinux))
 nscd-modules += selinux
 selinux-LIBS := -lselinux
@@ -59,7 +60,7 @@ endif
 LDLIBS-nscd = $(selinux-LIBS)
 
 distribute := nscd.h nscd-client.h dbg_log.h \
-	      $(addsuffix .c, $(filter-out xmalloc, $(nscd-modules))) \
+	      $(addsuffix .c, $(filter-out xmalloc,$(all-nscd-modules))) \
 	      nscd_nischeck.c nscd.conf nscd.init nscd_proto.h \
 	      nscd-types.h