Mercurial > hg > octave-kai > gnulib-hg
changeset 11084:1392a1800208
Don't install charset.alias on mingw and Cygwin.
| author | Bruno Haible <bruno@clisp.org> |
|---|---|
| date | Sun, 25 Jan 2009 18:15:44 +0100 |
| parents | b9fea7c408e9 |
| children | b79789bdd93c |
| files | ChangeLog modules/localcharset |
| diffstat | 2 files changed, 21 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +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.
--- a/modules/localcharset +++ b/modules/localcharset @@ -40,13 +40,25 @@ 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) ; \