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

diff --git a/modules/localcharset b/modules/localcharset
index 0fccf8f88..2d4a7009a 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
@@ -33,13 +40,27 @@ all-local: charset.alias ref-add.sed ref-del.sed
 charset_alias = $(DESTDIR)$(libdir)/charset.alias
 charset_tmp = $(DESTDIR)$(libdir)/charset.tmp
 install-exec-local: all-local
-	test $(GLIBC21) != no || $(mkinstalldirs) $(DESTDIR)$(libdir)
+	if test $(GLIBC21) = no; then \
+	  case '$(host_os)' in \
+	    darwin[56]*) \
+	      need_charset_alias=true ;; \
+	    darwin* | cygwin* | mingw* | pw32* | cegcc*) \
+	      need_charset_alias=false ;; \
+	    *) \
+	      need_charset_alias=true ;; \
+	  esac ; \
+	else \
+	  need_charset_alias=false ; \
+	fi ; \
+	if $$need_charset_alias; then \
+	  $(mkinstalldirs) $(DESTDIR)$(libdir) ; \
+	fi ; \
 	if test -f $(charset_alias); then \
 	  sed -f ref-add.sed $(charset_alias) > $(charset_tmp) ; \
 	  $(INSTALL_DATA) $(charset_tmp) $(charset_alias) ; \
 	  rm -f $(charset_tmp) ; \
 	else \
-	  if test $(GLIBC21) = no; then \
+	  if $$need_charset_alias; then \
 	    sed -f ref-add.sed charset.alias > $(charset_tmp) ; \
 	    $(INSTALL_DATA) $(charset_tmp) $(charset_alias) ; \
 	    rm -f $(charset_tmp) ; \
@@ -61,14 +82,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 +96,7 @@ Include:
 "localcharset.h"
 
 License:
-LGPL
+LGPLv2+
 
 Maintainer:
 Bruno Haible