Don't install charset.alias on mingw and Cygwin.

diff --git a/ChangeLog b/ChangeLog
index 3b762f9..e3be07e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
 2009-01-25  Bruno Haible  <bruno@clisp.org>
 
+       Don't install charset.alias on mingw and Cygwin.
+       * modules/localcharset (install-exec-local): Don't install
+       charset.alias on mingw and Cygwin, if the file does not yet exist.
+       The result for these platforms is hardcoded in localcharset.c.
+
+2009-01-25  Bruno Haible  <bruno@clisp.org>
+
        Make it possible again to use AC_GNU_SOURCE together with gnulib.
        * m4/extensions.m4 (gl_USE_SYSTEM_EXTENSIONS): Require AC_GNU_SOURCE
        before requiring AC_USE_SYSTEM_EXTENSIONS.

diff --git a/modules/localcharset b/modules/localcharset
index f0b7ed7..ae42b03 100644 (file)
--- a/modules/localcharset
+++ b/modules/localcharset
@@ -40,13 +40,25 @@ 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 \
+           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) ; \