Don't install charset.alias on mingw and Cygwin.
diff --git a/libcharset/ChangeLog b/libcharset/ChangeLog
index 75b7382..378d84b 100644
--- a/libcharset/ChangeLog
+++ b/libcharset/ChangeLog
@@ -1,3 +1,17 @@
+2009-01-25 Bruno Haible <bruno@clisp.org>
+
+ Don't install charset.alias on mingw and Cygwin.
+ * INTEGRATE: 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-24 Bruno Haible <bruno@clisp.org>
+
+ * tools/all-charsets: Add CP1131, ARMSCII-8, PT154 to the list of
+ allowed encodings.
+ * tools/darwin-7.5: Regenerated.
+ * tools/darwin-9.5: Regenerated.
+
2009-01-18 Bruno Haible <bruno@clisp.org>
* tools/darwin-9.5: New file.
diff --git a/libcharset/INTEGRATE b/libcharset/INTEGRATE
index d3b4133..d4b393e 100644
--- a/libcharset/INTEGRATE
+++ b/libcharset/INTEGRATE
@@ -36,13 +36,25 @@
- Augment target "install" by
- 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 $(DESTDIR)$(libdir)/charset.alias; then \
sed -f ref-add.sed $(DESTDIR)$(libdir)/charset.alias > $(DESTDIR)$(libdir)/t-charset.alias; \
$(INSTALL_DATA) $(DESTDIR)$(libdir)/t-charset.alias $(DESTDIR)$(libdir)/charset.alias; \
rm -f $(DESTDIR)$(libdir)/t-charset.alias; \
else \
- if test @GLIBC21@ = no; then \
+ if $$need_charset_alias; then \
sed -f ref-add.sed charset.alias > $(DESTDIR)$(libdir)/t-charset.alias; \
$(INSTALL_DATA) $(DESTDIR)$(libdir)/t-charset.alias $(DESTDIR)$(libdir)/charset.alias; \
rm -f $(DESTDIR)$(libdir)/t-charset.alias; \
@@ -51,7 +63,19 @@
- Augment target "installdirs" by
- 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 ; \
- Augment target "uninstall" by
diff --git a/libcharset/lib/ChangeLog b/libcharset/lib/ChangeLog
index b404a9a..1cfe576 100644
--- a/libcharset/lib/ChangeLog
+++ b/libcharset/lib/ChangeLog
@@ -1,3 +1,10 @@
+2009-01-25 Bruno Haible <bruno@clisp.org>
+
+ Don't install charset.alias on mingw and Cygwin.
+ * Makefile.in (install, installdirs): 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-24 Bruno Haible <bruno@clisp.org>
Add support for non-UTF-8 locales on MacOS X.
diff --git a/libcharset/lib/Makefile.in b/libcharset/lib/Makefile.in
index 780f168..d8e5073 100644
--- a/libcharset/lib/Makefile.in
+++ b/libcharset/lib/Makefile.in
@@ -95,14 +95,26 @@
# avoid installing it.
install : all force
- $(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 ; \
$(LIBTOOL_INSTALL) $(INSTALL_DATA) libcharset.la $(DESTDIR)$(libdir)/libcharset.la
if test -f $(DESTDIR)$(libdir)/charset.alias; then \
sed -f ref-add.sed $(DESTDIR)$(libdir)/charset.alias > $(DESTDIR)$(libdir)/t-charset.alias; \
$(INSTALL_DATA) $(DESTDIR)$(libdir)/t-charset.alias $(DESTDIR)$(libdir)/charset.alias; \
rm -f $(DESTDIR)$(libdir)/t-charset.alias; \
else \
- if test @GLIBC21@ = no; then \
+ if $$need_charset_alias; then \
sed -f ref-add.sed charset.alias > $(DESTDIR)$(libdir)/t-charset.alias; \
$(INSTALL_DATA) $(DESTDIR)$(libdir)/t-charset.alias $(DESTDIR)$(libdir)/charset.alias; \
rm -f $(DESTDIR)$(libdir)/t-charset.alias; \
@@ -112,7 +124,19 @@
install-strip : install
installdirs : force
- $(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 ; \
uninstall : force
$(LIBTOOL_UNINSTALL) $(RM) $(DESTDIR)$(libdir)/libcharset.la