merge with 0.10.24

4 files changed, 54 insertions, 20 deletions

diff --git a/intl/ChangeLog b/intl/ChangeLog
index 32ef3c3..1d76ceb 100644
--- a/intl/ChangeLog
+++ b/intl/ChangeLog
@@ -1,3 +1,28 @@
+Sat Aug 31 03:07:09 1996  Ulrich Drepper  <drepper@cygnus.com>
+
+	* l10nflist.c (_nl_normalize_codeset): We convert to lower case,
+	so don't prepend uppercase `ISO' for only numeric arg.
+
+Fri Jul 19 00:15:46 1996  Ulrich Drepper  <drepper@cygnus.com>
+
+	* l10nflist.c: Move inclusion of argz.h, ctype.h, stdlib.h after
+	definition of _GNU_SOURCE.  Patch by Roland McGrath.
+
+	* Makefile.in (uninstall): Fix another bug with `for' loop and
+	empty arguments.  Patch by Jim Meyering.  Correct name os
+	uninstalled files: no intl- prefix anymore.
+
+	* Makefile.in (install-data): Again work around shells which
+	cannot handle mpty for list.  Reported by Jim Meyering.
+
+Sat Jul 13 18:11:35 1996  Ulrich Drepper  <drepper@cygnus.com>
+
+	* Makefile.in (install): Split goal.  Now depend on install-exec
+        and install-data.
+	(install-exec, install-data): New goals.  Created from former
+	install goal.
+	Reported by Karl Berry.
+
 Sat Jun 22 04:58:14 1996  Ulrich Drepper  <drepper@cygnus.com>
 
 	* Makefile.in (MKINSTALLDIRS): New variable.  Path to
diff --git a/intl/Makefile.in b/intl/Makefile.in
index 6b5a82e..18c5f53 100644
--- a/intl/Makefile.in
+++ b/intl/Makefile.in
@@ -97,17 +97,26 @@ check: all
 # where configure found a previously installed GNU gettext library.
 # If you want to use the one which comes with this version of the
 # package, you have to use `configure --with-included-gettext'.
-install: all
-	if test "$(PACKAGE)" = "gettext"; then \
+install: install-exec install-data
+install-exec: all
+	if test "$(PACKAGE)" = "gettext" \
+	   && test '@INTLOBJS@' = '$(GETTOBJS)'; then \
 	  if test -r $(MKINSTALLDIRS); then \
-	    $(MKINSTALLDIRS) $(libdir) $(includedir) $(gettextsrcdir); \
+	    $(MKINSTALLDIRS) $(libdir) $(includedir); \
 	  else \
-	    $(top_srcdir)/mkinstalldirs $(libdir) $(includedir) \
-	      $(gettextsrcdir); \
+	    $(top_srcdir)/mkinstalldirs $(libdir) $(includedir); \
 	  fi; \
-	  if test '@INTLOBJS@' = '$(GETTOBJS)'; then \
-	    $(INSTALL_DATA) intlh.inst $(includedir)/libintl.h; \
-	    $(INSTALL_DATA) libintl.a $(libdir)/libintl.a; \
+	  $(INSTALL_DATA) intlh.inst $(includedir)/libintl.h; \
+	  $(INSTALL_DATA) libintl.a $(libdir)/libintl.a; \
+	else \
+	  : ; \
+	fi
+install-data: all
+	if test "$(PACKAGE)" = "gettext"; then \
+	  if test -r $(MKINSTALLDIRS); then \
+	    $(MKINSTALLDIRS) $(gettextsrcdir); \
+	  else \
+	    $(top_srcdir)/mkinstalldirs $(gettextsrcdir); \
 	  fi; \
 	  $(INSTALL_DATA) VERSION $(gettextsrcdir)/VERSION; \
 	  cd $(srcdir) && \
@@ -125,7 +134,7 @@ installcheck:
 uninstall:
 	dists="$(DISTFILES)"; \
 	for file in $$dists; do \
-	  rm -f $(gettextsrcdir)/intl-$$file; \
+	  rm -f $(gettextsrcdir)/$$file; \
 	done
 
 info dvi:
diff --git a/intl/VERSION b/intl/VERSION
index 894bda1..ae9ea49 100644
--- a/intl/VERSION
+++ b/intl/VERSION
@@ -1 +1 @@
-GNU gettext library from gettext-0.10.23
+GNU gettext library from gettext-0.10.24
diff --git a/intl/l10nflist.c b/intl/l10nflist.c
index 18c5ba5..fd097d7 100644
--- a/intl/l10nflist.c
+++ b/intl/l10nflist.c
@@ -21,15 +21,6 @@ Boston, MA 02111-1307, USA.  */
 # include <config.h>
 #endif
 
-#if defined _LIBC || defined HAVE_ARGZ_H
-# include <argz.h>
-#endif
-#include <ctype.h>
-
-#if defined STDC_HEADERS || defined _LIBC
-# include <stdlib.h>
-#endif
-
 #if defined HAVE_STRING_H || defined _LIBC
 # ifndef _GNU_SOURCE
 #  define _GNU_SOURCE	1
@@ -44,6 +35,15 @@ Boston, MA 02111-1307, USA.  */
 # endif
 #endif
 
+#if defined _LIBC || defined HAVE_ARGZ_H
+# include <argz.h>
+#endif
+#include <ctype.h>
+
+#if defined STDC_HEADERS || defined _LIBC
+# include <stdlib.h>
+#endif
+
 #include "loadinfo.h"
 
 /* On some strange systems still no definition of NULL is found.  Sigh!  */
@@ -366,7 +366,7 @@ _nl_normalize_codeset (codeset, name_len)
   if (retval != NULL)
     {
       if (only_digit)
-	wp = stpcpy (retval, "ISO");
+	wp = stpcpy (retval, "iso");
       else
 	wp = retval;