[commits] r1151 - in /trunk/localedef: ChangeLog.eglibc Makefile.in

[jimb@xxxxxxxxxx]

Author: jimb
Date: Tue Jan  9 15:54:11 2007
New Revision: 1151

Log:
ChangeLog.eglibc:
2006-12-26  Jim Blandy  <jimb@xxxxxxxxxxxxxxxx>

       * Makefile.in: Include option-groups.mak from glibc.  Trim
       locale list if OPTION_EGLIBC_LOCALES is not enabled.

Modified:
    trunk/localedef/ChangeLog.eglibc
    trunk/localedef/Makefile.in

Modified: trunk/localedef/ChangeLog.eglibc
==============================================================================
--- trunk/localedef/ChangeLog.eglibc (original)
+++ trunk/localedef/ChangeLog.eglibc Tue Jan  9 15:54:11 2007
@@ -1,3 +1,8 @@
+2006-12-26  Jim Blandy  <jimb@xxxxxxxxxxxxxxxx>
+
+        * Makefile.in: Include option-groups.mak from glibc.  Trim
+        locale list if OPTION_EGLIBC_LOCALES is not enabled.
+
 2006-09-07  Richard Sandiford  <richard@xxxxxxxxxxxxxxxx>
 
 	Initial commit.

Modified: trunk/localedef/Makefile.in
==============================================================================
--- trunk/localedef/Makefile.in (original)
+++ trunk/localedef/Makefile.in Tue Jan  9 15:54:11 2007
@@ -118,7 +118,21 @@
 #----------------------------------------------------------------------------
 # Based on localedata/Makefile
 #----------------------------------------------------------------------------
+.. = glibc/
+
+# Get EGLIBC's option group variable definitions.  By default, this
+# will look for an 'option-groups.config' file in localedef's top
+# build directory.  If you are using a single localedef build tree
+# with several different option group configurations, set
+# option_group_config_file on the make command line to the name of the
+# option group config file to use.
+include glibc/option-groups.mak
 include glibc/localedata/SUPPORTED
+
+# Only install locale data if OPTION_EGLIBC_LOCALES is selected.
+ifneq ($(OPTION_EGLIBC_LOCALES),y)
+SUPPORTED-LOCALES :=
+endif
 
 INSTALL-SUPPORTED-LOCALES=$(addprefix install-, $(SUPPORTED-LOCALES))