Author: sebor
Date: Fri Jan 12 12:57:36 2007
New Revision: 495737
URL: http://svn.apache.org/viewvc?view=rev&rev=495737
Log:
2007-01-12 Martin Sebor <[EMAIL PROTECTED]>
* GNUmakefile.bin (install): Handled locales with the @ modifier
in their name. Correctly handled the LOCALES variable when set
to the empty string.
Modified:
incubator/stdcxx/trunk/etc/config/GNUmakefile.bin
Modified: incubator/stdcxx/trunk/etc/config/GNUmakefile.bin
URL:
http://svn.apache.org/viewvc/incubator/stdcxx/trunk/etc/config/GNUmakefile.bin?view=diff&rev=495737&r1=495736&r2=495737
==============================================================================
--- incubator/stdcxx/trunk/etc/config/GNUmakefile.bin (original)
+++ incubator/stdcxx/trunk/etc/config/GNUmakefile.bin Fri Jan 12 12:57:36 2007
@@ -131,8 +131,10 @@
# compute the names of codesets (codecvt databases) and set
# the variable only for the install target for efficiency
-install: codesets := \
- $(sort $(shell echo $(LOCALES) | sed "s/[a-z][a-z_A-Z]*\.\([^ ]*\)/\1/g"))
+install: codesets := \
+ $(sort $(shell echo $(LOCALES) \
+ | sed -e "s/[^ [EMAIL PROTECTED] [EMAIL PROTECTED]([^
]*\)/\1/g" \
+ -e "s/@[^ ]*//g"))
# create the $(PREFIX)/bin $(PREFIX)/nls directories and install
# the utilities and locales
@@ -140,6 +142,8 @@
mkdir -p $(PREFIX)/bin
cp locale localedef $(PREFIX)/bin
mkdir -p $(PREFIX)/nls
- cd ../nls && cp -R $(LOCALES) $(codesets) $(PREFIX)/nls
+ if [ "$(LOCALES)" != "" ]; then \
+ cd ../nls && cp -R $(LOCALES) $(codesets) $(PREFIX)/nls; \
+ fi
include ../makefile.rules
