X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=modules%2Flocalcharset;h=f0b7ed7193e78272af6ccb65156a77d2bfb506bb;hb=ae22732e85d6c314545b2b4772e56d7b541ef2d2;hp=0fccf8f884f9480d2d495ae1ab99df170c309793;hpb=d1aadab21bf8755e0fb75a838dc650e73f6ee78d;p=gnulib.git

diff --git a/modules/localcharset b/modules/localcharset
index 0fccf8f88..f0b7ed719 100644
--- a/modules/localcharset
+++ b/modules/localcharset
@@ -1,6 +1,12 @@
 Description:
 Return current locale's character encoding.
 
+Notice:
+If your package's tests make use of the locale_charset() function directly or
+indirectly, you may need to define the CHARSETALIASDIR environment variable,
+so that "make check" works before "make install". In Makefile.am syntax:
+TESTS_ENVIRONMENT += @LOCALCHARSET_TESTS_ENVIRONMENT@
+
 Files:
 lib/localcharset.h
 lib/localcharset.c
@@ -16,10 +22,11 @@ configmake
 
 configure.ac:
 gl_LOCALCHARSET
+LOCALCHARSET_TESTS_ENVIRONMENT="CHARSETALIASDIR=\"\$(top_builddir)/$gl_source_base\""
+AC_SUBST([LOCALCHARSET_TESTS_ENVIRONMENT])
 
 Makefile.am:
 lib_SOURCES += localcharset.h localcharset.c
-EXTRA_DIST += config.charset ref-add.sin ref-del.sin
 
 # We need the following in order to install a simple file in $(libdir)
 # which is shared with other installed packages. We use a list of referencing
@@ -61,14 +68,12 @@ uninstall-local: all-local
 charset.alias: config.charset
 	rm -f t-$@ $@
 	$(SHELL) $(srcdir)/config.charset '$(host)' > t-$@
-	chmod a-x t-$@
 	mv t-$@ $@
 
 SUFFIXES += .sed .sin
 .sin.sed:
 	rm -f t-$@ $@
 	sed -e '/^#/d' -e 's/@''PACKAGE''@/$(PACKAGE)/g' $< > t-$@
-	chmod a-x t-$@
 	mv t-$@ $@
 
 CLEANFILES += charset.alias ref-add.sed ref-del.sed
@@ -77,7 +82,7 @@ Include:
 "localcharset.h"
 
 License:
-LGPL
+LGPLv2+
 
 Maintainer:
 Bruno Haible