summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjimb <jimb@7b3dc134-2b1b-0410-93df-9e9f96275f8d>2007-01-09 23:54:11 +0000
committerjimb <jimb@7b3dc134-2b1b-0410-93df-9e9f96275f8d>2007-01-09 23:54:11 +0000
commit214735130e92b60b58d79c4275f4c70ec1841fc7 (patch)
treeda9db1eef3b8df64b63b281f42de7ac2a4ef3e9a
parentcc84c6d5bf1525d8215d8a7622670e0200fc0e89 (diff)
downloadlocaledef-214735130e92b60b58d79c4275f4c70ec1841fc7.tar.gz
localedef-214735130e92b60b58d79c4275f4c70ec1841fc7.tar.xz
ChangeLog.eglibc:
2006-12-26 Jim Blandy <jimb@codesourcery.com> * Makefile.in: Include option-groups.mak from glibc. Trim locale list if OPTION_EGLIBC_LOCALES is not enabled. git-svn-id: svn://svn.eglibc.org/trunk/localedef@1151 7b3dc134-2b1b-0410-93df-9e9f96275f8d
-rw-r--r--ChangeLog.eglibc5
-rw-r--r--Makefile.in14
2 files changed, 19 insertions, 0 deletions
diff --git a/ChangeLog.eglibc b/ChangeLog.eglibc
index 4965924..26ec79a 100644
--- a/ChangeLog.eglibc
+++ b/ChangeLog.eglibc
@@ -1,3 +1,8 @@
+2006-12-26 Jim Blandy <jimb@codesourcery.com>
+
+ * Makefile.in: Include option-groups.mak from glibc. Trim
+ locale list if OPTION_EGLIBC_LOCALES is not enabled.
+
2006-09-07 Richard Sandiford <richard@codesourcery.com>
Initial commit.
diff --git a/Makefile.in b/Makefile.in
index bb192e2..5fecb9d 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -118,8 +118,22 @@ vasprintf.o: $(srcdir)/vasprintf.c
#----------------------------------------------------------------------------
# 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))
LOCALEDEF=\