X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=modules%2Flocalcharset;h=f0b7ed7193e78272af6ccb65156a77d2bfb506bb;hb=e349e3d9c187700b118e0bac80aedd2ea8e764bc;hp=b832700f1ce847caf6299b81da1cb48248207a81;hpb=5143f4e91f44130093914be7cf05873c7d8a4369;p=gnulib.git

diff --git a/modules/localcharset b/modules/localcharset
index b832700f1..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
@@ -12,14 +18,15 @@ m4/glibc21.m4
 m4/localcharset.m4
 
 Depends-on:
+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
-DEFS += -DLIBDIR=\"$(libdir)\"
 
 # 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
@@ -59,11 +66,13 @@ uninstall-local: all-local
 	fi
 
 charset.alias: config.charset
+	rm -f t-$@ $@
 	$(SHELL) $(srcdir)/config.charset '$(host)' > t-$@
 	mv t-$@ $@
 
 SUFFIXES += .sed .sin
 .sin.sed:
+	rm -f t-$@ $@
 	sed -e '/^#/d' -e 's/@''PACKAGE''@/$(PACKAGE)/g' $< > t-$@
 	mv t-$@ $@
 
@@ -73,7 +82,7 @@ Include:
 "localcharset.h"
 
 License:
-LGPL
+LGPLv2+
 
 Maintainer:
 Bruno Haible