=== modified file 'ChangeLog'
--- ChangeLog	2014-01-05 00:55:29 +0000
+++ ChangeLog	2014-01-05 22:59:34 +0000
@@ -1,5 +1,13 @@
 2014-01-05  Paul Eggert  <eggert@cs.ucla.edu>
 
+	Optionally install ASCII info marks (Bug#16292).
+	* build-aux/ascii-info-marks: New file.
+	* configure.ac: New option --with-ascii-info-marks,
+	which configures INSTALL_INFO_DATA.
+	* Makefile.in (INSTALL_INFO_DATA): New macro.
+	(install-info): Use it.
+	* INSTALL: Document --with-ascii-info-marks.
+
 	Port to GNU/Linux with recent grsecurity/PaX patches (Bug#16343).
 	Problem and proposed patch reported by Ulrich Mueller;
 	this patch uses a somewhat-different approach.

=== modified file 'INSTALL'
--- INSTALL	2014-01-01 07:43:34 +0000
+++ INSTALL	2014-01-05 22:59:34 +0000
@@ -327,6 +327,11 @@
 even on hosts where a narrower type would do.  With this option, on a
 typical 32-bit host, Emacs integers have 62 bits instead of 30.
 
+Use --with-ascii-info-marks to install Info files with ASCII
+punctuation marks, e.g., 'A-Z' rather than ‘A–Z’; this is the default
+if UTF-8 is not supported.  Use --without-ascii-info-marks to install
+Info files as-is.
+
 Use --enable-gcc-warnings to enable compile-time checks that warn
 about possibly-questionable C code.  This is intended for developers
 and is useful with GNU-compatible compilers.  On a recent GNU system

=== modified file 'Makefile.in'
--- Makefile.in	2014-01-01 07:43:34 +0000
+++ Makefile.in	2014-01-05 22:59:34 +0000
@@ -255,6 +255,7 @@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_INFO = @INSTALL_INFO@
+INSTALL_INFO_DATA = @INSTALL_INFO_DATA@
 # By default, we uphold the dignity of our programs.
 INSTALL_STRIP =
 MKDIR_P = @MKDIR_P@
@@ -663,7 +664,8 @@
 	      test "$(HAVE_MAKEINFO)" = "no" && test ! -f $$elt && continue; \
 	      for f in `ls $$elt $$elt-[1-9] $$elt-[1-9][0-9] 2>/dev/null`; do \
 	       (cd "$${thisdir}"; \
-	        ${INSTALL_DATA} ${srcdir}/info/$$f "$(DESTDIR)${infodir}/$$f"); \
+	        ${INSTALL_INFO_DATA} ${srcdir}/info/$$f \
+		  "$(DESTDIR)${infodir}/$$f"); \
 	        [ -n "${GZIP_PROG}" ] || continue ; \
 	        rm -f "$(DESTDIR)${infodir}/$$f.gz"; \
 	        ${GZIP_PROG} -9n "$(DESTDIR)${infodir}/$$f"; \

=== modified file 'configure.ac'
--- configure.ac	2014-01-05 01:00:32 +0000
+++ configure.ac	2014-01-05 22:59:34 +0000
@@ -300,6 +300,17 @@
   [don't compress some files (.el, .info, etc.) when installing.  Equivalent to:
 make GZIP_PROG= install])
 
+AC_ARG_WITH([ascii-info-marks],
+  [AS_HELP_STRING([--with-ascii-info-marks],
+     [install info files with 'A-Z', not ‘A–Z’])],
+  [],
+  [[case `(locale -a) 2>/dev/null` in
+      *.[Uu][Tt][Ff]-8* | *.[Uu][Tt][Ff]8*)
+	with_ascii_info_marks=no ;;
+      *)
+	with_ascii_info_marks=$with_features ;;
+    esac]])
+
 AC_ARG_WITH([pkg-config-prog],dnl
 [AS_HELP_STRING([--with-pkg-config-prog=FILENAME],
                   [file name of pkg-config for finding GTK and librsvg])])
@@ -973,6 +984,14 @@
 
 AC_PATH_PROG(INSTALL_INFO, install-info, :,
   $PATH$PATH_SEPARATOR/usr/sbin$PATH_SEPARATOR/sbin)
+
+if test "$with_ascii_info_marks" = yes; then
+  INSTALL_INFO_DATA='build-aux/ascii-info-marks'
+else
+  INSTALL_INFO_DATA='$(INSTALL_DATA)'
+fi
+AC_SUBST([INSTALL_INFO_DATA])
+
 dnl Don't use GZIP, which is used by gzip for additional parameters.
 AC_PATH_PROG(GZIP_PROG, gzip)
 

=== modified file 'etc/ChangeLog'
--- etc/ChangeLog	2014-01-05 20:17:13 +0000
+++ etc/ChangeLog	2014-01-05 22:59:34 +0000
@@ -1,3 +1,8 @@
+2014-01-05  Paul Eggert  <eggert@cs.ucla.edu>
+
+	Optionally install ASCII info marks (Bug#16292).
+	* NEWS: Document --with-ascii-info-marks.
+
 2014-01-05  Tassilo Horn  <tsdh@gnu.org>
 
 	* themes/tsdh-light-theme.el (tsdh-light): Define org-level-*

=== modified file 'etc/NEWS'
--- etc/NEWS	2014-01-05 06:10:52 +0000
+++ etc/NEWS	2014-01-05 22:59:34 +0000
@@ -38,6 +38,10 @@
 and renamed to `--without-compress-install'.  It now prevents compression
 of _any_ files during installation.
 
+** The configure option `--with-ascii-info-marks' installs info files
+that use ASCII punctuation marks, e.g., 'A-Z' rather than ‘A–Z’.  This
+is the default if UTF-8 is not supported.
+
 ** The configure option `--with-crt-dir' has been removed.
 It is no longer needed, as the crt*.o files are no longer linked
 specially.