[commits] r3563 - in /trunk/libc: ChangeLog.eglibc nss/Makefile option-groups.def

[jimb@xxxxxxxxxx]

Author: jimb
Date: Fri Sep 21 17:37:23 2007
New Revision: 3563

Log:
* nss/Makefile: Treat OPTION_EGLIBC_NSSWITCH_FIXED_FUNCTIONS and
OPTION_EGLIBC_NSSWITCH_FIXED_CONFIG as absolute filenames.
* option-groups.def: Update documentation.

Modified:
    trunk/libc/ChangeLog.eglibc
    trunk/libc/nss/Makefile
    trunk/libc/option-groups.def

Modified: trunk/libc/ChangeLog.eglibc
==============================================================================
--- trunk/libc/ChangeLog.eglibc (original)
+++ trunk/libc/ChangeLog.eglibc Fri Sep 21 17:37:23 2007
@@ -1,4 +1,8 @@
 2007-09-21  Jim Blandy  <jimb@xxxxxxxxxxxxxxxx>
+
+	* nss/Makefile: Treat OPTION_EGLIBC_NSSWITCH_FIXED_FUNCTIONS and
+	OPTION_EGLIBC_NSSWITCH_FIXED_CONFIG as absolute filenames.
+	* option-groups.def: Update documentation.
 
 	Implement the OPTION_EGLIBC_BACKTRACE option group.
 	* option-groups.def (OPTION_EGLIBC_BACKTRACE): New entry.

Modified: trunk/libc/nss/Makefile
==============================================================================
--- trunk/libc/nss/Makefile (original)
+++ trunk/libc/nss/Makefile Fri Sep 21 17:37:23 2007
@@ -89,33 +89,33 @@
 $(error OPTION_EGLIBC_NSSWITCH_FIXED_FUNCTIONS variable left unset)
 endif
 
-ifeq (,$(wildcard $(common-objpfx)$(OPTION_EGLIBC_NSSWITCH_FIXED_CONFIG)))
+ifeq (,$(wildcard $(OPTION_EGLIBC_NSSWITCH_FIXED_CONFIG)))
 $(warning OPTION_EGLIBC_NSSWITCH is disabled, but fixed config file)
 $(error does not exist: $(OPTION_EGLIBC_NSSWITCH_FIXED_CONFIG))
 endif
 
-ifeq (,$(wildcard $(common-objpfx)$(OPTION_EGLIBC_NSSWITCH_FIXED_FUNCTIONS)))
+ifeq (,$(wildcard $(OPTION_EGLIBC_NSSWITCH_FIXED_FUNCTIONS)))
 $(warning OPTION_EGLIBC_NSSWITCH is disabled, but fixed functions file)
 $(error does not exist: $(OPTION_EGLIBC_NSSWITCH_FIXED_FUNCTIONS))
 endif
 
 before-compile := $(objpfx)fixed-nsswitch.h
 generated := fixed-nsswitch.h
-$(objpfx)fixed-nsswitch.h $(objfpx)fixed-nsswitch-libs:		\
-    $(objpfx)gen-fixed-nsswitch					\
-    $(common-objpfx)$(OPTION_EGLIBC_NSSWITCH_FIXED_CONFIG)
-	$< $(objpfx)fixed-nsswitch.h					\
-	   $(objpfx)fixed-nsswitch-libs					\
-	   $(common-objpfx)$(OPTION_EGLIBC_NSSWITCH_FIXED_CONFIG)
+$(objpfx)fixed-nsswitch.h $(objfpx)fixed-nsswitch-libs:	\
+    $(objpfx)gen-fixed-nsswitch				\
+    $(OPTION_EGLIBC_NSSWITCH_FIXED_CONFIG)
+	$< $(objpfx)fixed-nsswitch.h			\
+	   $(objpfx)fixed-nsswitch-libs			\
+	   $(OPTION_EGLIBC_NSSWITCH_FIXED_CONFIG)
 
-$(objpfx)gen-fixed-nsswitch: gen-fixed-nsswitch.c		\
-    $(common-objpfx)option-groups.config			\
-    $(common-objpfx)$(OPTION_EGLIBC_NSSWITCH_FIXED_FUNCTIONS)
+$(objpfx)gen-fixed-nsswitch: gen-fixed-nsswitch.c	\
+    $(common-objpfx)option-groups.config		\
+    $(OPTION_EGLIBC_NSSWITCH_FIXED_FUNCTIONS)
 	$(native-compile)
-gen-fixed-nsswitch-CFLAGS = \
-	-g3 -O -Wall \
-	-I $(objpfx) \
-	-DFIXED_FUNCTIONS='"$(common-objpfx)$(OPTION_EGLIBC_NSSWITCH_FIXED_FUNCTIONS)"'
+gen-fixed-nsswitch-CFLAGS =						\
+	-g3 -O -Wall							\
+	-I $(objpfx)							\
+	-DFIXED_FUNCTIONS='"$(OPTION_EGLIBC_NSSWITCH_FIXED_FUNCTIONS)"'
 endif
 
 include ../Rules

Modified: trunk/libc/option-groups.def
==============================================================================
--- trunk/libc/option-groups.def (original)
+++ trunk/libc/option-groups.def Fri Sep 21 17:37:23 2007
@@ -447,9 +447,9 @@
           specifies, instead of consulting '/etc/nsswitch.conf' at run
           time.
 
-          This should be a relative file name; EGLIBC will look for it
-          in the top build directory, along with the
-          'option-groups.config' file.
+          This should be an absolute filename.  The EGLIBC build
+          process may use it from several different working
+          directories.
 
           The EGLIBC source tree includes a sample configuration file
           named 'nss/fixed-nsswitch.conf'; for simple configurations,
@@ -464,9 +464,9 @@
           configuration file for this setting, and explains its syntax
           and meaning in more detail.
 
-          This should be a relative file name; EGLIBC will look for it
-          in the top build directory, along with the
-          'option-groups.config' file.
+          This should be an absolute file name.  The EGLIBC build
+          process may use it from several different working
+          directories.
 
           Be sure to mention each function in each service you wish to
           use.  If you do not mention a service's function here, the