From: Bruno Haible <bruno@clisp.org>
Date: Sun, 25 Jan 2009 17:40:39 +0000 (+0000)
Subject: Don't install charset.alias on mingw and Cygwin.
X-Git-Tag: v0.18~250
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=04910d271f63a77dddc0d42ea134f21824516418;p=thirdparty%2Fgettext.git

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

diff --git a/gettext-runtime/intl/ChangeLog b/gettext-runtime/intl/ChangeLog
index d0065b684..e8640157d 100644
--- a/gettext-runtime/intl/ChangeLog
+++ b/gettext-runtime/intl/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-exec, 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/gettext-runtime/intl/Makefile.in b/gettext-runtime/intl/Makefile.in
index 3d107c368..b44aaeff2 100644
--- a/gettext-runtime/intl/Makefile.in
+++ b/gettext-runtime/intl/Makefile.in
@@ -1,5 +1,5 @@
 # Makefile for directory with message catalog handling library of GNU gettext
-# Copyright (C) 1995-1998, 2000-2007 Free Software Foundation, Inc.
+# Copyright (C) 1995-1998, 2000-2007, 2009 Free Software Foundation, Inc.
 #
 # This program is free software; you can redistribute it and/or modify it
 # under the terms of the GNU Library General Public License as published
@@ -371,7 +371,19 @@ install-exec: all
 	  : ; \
 	fi
 	if test '@USE_INCLUDED_LIBINTL@' = yes; then \
-	  test @GLIBC21@ != no || $(mkdir_p) $(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 \
+	    $(mkdir_p) $(DESTDIR)$(libdir); \
+	  fi; \
 	  temp=$(DESTDIR)$(libdir)/t-charset.alias; \
 	  dest=$(DESTDIR)$(libdir)/charset.alias; \
 	  if test -f $(DESTDIR)$(libdir)/charset.alias; then \
@@ -380,7 +392,7 @@ install-exec: all
 	    $(INSTALL_DATA) $$temp $$dest; \
 	    rm -f $$temp; \
 	  else \
-	    if test @GLIBC21@ = no; then \
+	    if $$need_charset_alias; then \
 	      orig=charset.alias; \
 	      sed -f ref-add.sed $$orig > $$temp; \
 	      $(INSTALL_DATA) $$temp $$dest; \
@@ -443,7 +455,19 @@ installdirs:
 	  : ; \
 	fi
 	if test '@USE_INCLUDED_LIBINTL@' = yes; then \
-	  test @GLIBC21@ != no || $(mkdir_p) $(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 \
+	    $(mkdir_p) $(DESTDIR)$(libdir); \
+	  fi; \
 	  $(mkdir_p) $(DESTDIR)$(localedir); \
 	else \
 	  : ; \