summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--extra/locale/Makefile13
-rw-r--r--libc/misc/locale/Makefile10
2 files changed, 17 insertions, 6 deletions
diff --git a/extra/locale/Makefile b/extra/locale/Makefile
index de985b458..174329817 100644
--- a/extra/locale/Makefile
+++ b/extra/locale/Makefile
@@ -1,5 +1,6 @@
TOPDIR = ../../
+EXTRA_LOCALE_DIR:=${shell cd $(TOPDIR)/extra/locale && pwd}
include $(TOPDIR)Rules.mak
CFLAGS_wc8bit=-DCTYPE_PACKED=1
@@ -17,7 +18,8 @@ codesets.txt:
echo " "; \
echo "You do not have a codesets.txt file. Please create this "; \
echo "file in the extra/locale directory by running something like: "; \
- echo -e " find ./charmaps -name \"*.pairs\" > ./codesets.txt"; \
+ echo -e " find $(EXTRA_LOCALE_DIR)/charmaps -name \"*.pairs\" > \\"; \
+ echo -e " $(EXTRA_LOCALE_DIR)/codesets.txt"; \
echo "and then edit that file to disable/enable the codesets you wish to support. "; \
echo " "; \
/bin/false; \
@@ -51,9 +53,12 @@ locales.txt:
@if [ ! -f locales.txt ] ; then \
set -e; \
echo " "; \
- echo "You do not have a locales.txt file. In the extra/locale "; \
- echo "directory, Please copy the LOCALES file to locales.txt and "; \
- echo "then edit that file to disable/enable the locales you wish "; \
+ echo "You do not have a locales.txt file in the extra/locale "; \
+ echo "directory, Please copy the LOCALES file to locales.txt by "; \
+ echo "running something like: "; \
+ echo " cp $(EXTRA_LOCALE_DIR)/LOCALES \\ "; \
+ echo " $(EXTRA_LOCALE_DIR)/locales.txt "; \
+ echo "then edit locales.txt to disable/enable the locales you wish "; \
echo "to support. "; \
echo " "; \
/bin/false; \
diff --git a/libc/misc/locale/Makefile b/libc/misc/locale/Makefile
index 393336c50..881b0c0e5 100644
--- a/libc/misc/locale/Makefile
+++ b/libc/misc/locale/Makefile
@@ -1,7 +1,7 @@
# Makefile for uClibc
#
# Copyright (C) 2000 by Lineo, inc.
-# Copyright (C) 2000,2001 Erik Andersen <andersen@uclibc.org>
+# Copyright (C) 2000-2002 Erik Andersen <andersen@uclibc.org>
#
# This program is free software; you can redistribute it and/or modify it under
# the terms of the GNU Library General Public License as published by the Free
@@ -33,7 +33,7 @@ ifeq ($(HAS_LOCALE),true)
OBJS += locale_data.o
endif
-all: $(OBJS) $(LIBC)
+all: data $(OBJS) $(LIBC)
$(LIBC): ar-target
@@ -46,6 +46,12 @@ $(MOBJ): $(MSRC)
$(OBJS): Makefile
+data:
+ifeq ($(HAS_LOCALE),true)
+ make -C $(TOPDIR)/extra/locale
+endif
+
clean:
rm -f *.[oa] *~ core
+.PHONY: data