+2012-05-22 Paul Eggert <eggert@cs.ucla.edu>
+
+ Remove src/m/*.
+ * configure.in: Remove all mention of src/m/*.
+ (machine, machfile, M_FILE, config_machfile, and_machfile): Remove.
+ All uses removed.
+ (BITS_PER_CHAR, BITS_PER_SHORT, BITS_PER_INT, BITS_PER_LONG)
+ (BITS_PER_LONG_LONG): Move to src/lisp.h.
+ * lib/makefile.w32-in: Remove dependencies on
+ $(EMACS_ROOT)/src/m/intel386.h.
+ * make-dist: Don't make links to src/m.
+
+2012-05-22 Paul Eggert <eggert@cs.ucla.edu>
+
+ * Makefile.in (ACLOCAL_INPUTS): Fix up gnulib-comp.m4 name. (Bug#11529)
+ Without this further fix, aclocal was being invoked unnecessarily.
+
+2012-05-22 Glenn Morris <rgm@gnu.org>
+
+ * Makefile.in (blessmail, install-arch-dep, uninstall):
+ Check cd lib-src works.
+ (install-arch-dep, uninstall): Remove unneeded subshells.
+
+2012-05-21 Glenn Morris <rgm@gnu.org>
+
+ * update-subdirs: Move to build-aux/.
+ * make-dist, Makefile.in (install-arch-indep): Update for this change.
+
+ * Makefile.in (leimdir): New, set by configure.
+ (COPYDIR, COPYDESTS): Add leim directories.
+ (install-leim): Remove.
+ (install-arch-indep): Handle leim installation directly.
+
+ * vpath.sed: Remove unused file.
+ * make-dist: No more vpath.sed.
+
+2012-05-21 Paul Eggert <eggert@cs.ucla.edu>
+
+ Use full name for m4/gnulib-comp.m4. (Bug#11529)
+ Previously the file was named m4/gl-comp.m4 due to DOS 8+3 restrictions,
+ even though the file's name in gnulib is m4/gnulib-comp.m4.
+ This had a problem when merging from gnulib, as the code temporarily
+ renamed it to the full name, causing problems when interrupted.
+ Now the file has its full name, with the idea that we will find
+ a solution for MS-DOS that does not affect the rest of Emacs.
+ * m4/gnulib-comp.m4: Rename from m4/gl-comp.m4.
+
+ Assume C89 or later.
+ * configure.in (AC_C_PROTOTYPES, AC_C_VOLATILE, AC_C_CONST)
+ (POINTER_TYPE, PROTOTYPES): Remove.
+
+ Make merging from gnulib a script, not a makefile action.
+ Putting it in a makefile has some problems with reflection, as
+ merging from gnulib updates 'configure', which can update the makefile.
+ Putting it in a standalone script breaks this loop.
+ * Makefile.in (gnulib_srcdir, $(gnulib_srcdir), DOS_gnulib_comp.m4)
+ (GNULIB_MODULES, GNULIB_TOOL_FLAGS, sync-from-gnulib):
+ Remove, moving the actions to the script admin/merge-gnulib.
+
+2012-05-21 Glenn Morris <rgm@gnu.org>
+
+ * configure.in (LEIM_INSTALLDIR):
+ Rename to leimdir, treat like lispdir.
+
+2012-05-21 Glenn Morris <rgm@gnu.org>
+
+ * Makefile.in (install-arch-indep, install-doc, install-info)
+ (uninstall): Scrap superfluous subshells.
+
+2012-05-19 Ulrich Mueller <ulm@gentoo.org>
+
+ * Makefile.in (install-etc): Respect DESTDIR. (Bug#11518)
+
+2012-05-19 Paul Eggert <eggert@cs.ucla.edu>
+
+ * configure.in (AC_CHECK_FUNCS): Remove XSetWMProtocols,
+ getdomainname, mblen (twice), mbrlen (twice), mbsinit, ualarm,
+ getsockopt, setsockopt, mremap, mempcpy.
+
+ * configure.in (machine): Do not set to 'vax', since src/m/vax.h
+ is being removed.
+ (AC_CHECK_FUNCS): Remove ftime.
+
+2012-05-19 Glenn Morris <rgm@gnu.org>
+
+ * Makefile.in (install-arch-indep): Remove unneeded subshell.
+
+ * Makefile.in (install-arch-indep): Remove unneeded chmod.
+ Set permissions of lisp/subdirs.el.
+
+ * Makefile.in (SUBDIR): Add leim. Update users.
+
+ * Makefile.in (lib, lib-src, lisp): Check cd return value.
+
+ * Makefile.in (leim): No need to set PARALLEL.
+
+2012-05-18 Glenn Morris <rgm@gnu.org>
+
+ * Makefile.in (install-arch-indep, install-info, install-man):
+ Simplify some one-sided ifs.
+
+ * Makefile.in: Install only the relevant DOC file.
+ (install-arch-indep): Delete etc/DOC*.
+ (install-doc): No more need to delete etc/DOC.
+
+ * Makefile.in (install-arch-indep): Split into several rules.
+ (install-doc, innstall-info, install-man): New rules.
+
+ * configure.in (mandir): May as well include it in the NS app bundle.
+
+ * configure.in (INSTALL_ARCH_INDEP_EXTRA): New output variable.
+ * Makefile.in (INSTALL_ARCH_INDEP_EXTRA): New, set by configure.
+ (install-arch-indep): Don't install-etc for self-contained ns builds.
+
+ * configure.in (GCC_TEST_OPTIONS, NON_GCC_TEST_OPTIONS) <darwin>:
+ No longer unconditonally add /sw directories. (Bug#2280)
+
+ * Makefile.in (install-arch-dep): Depend on install-arch-indep.
+ (install-arch-indep): Depend on install-leim.
+ (install): Remove explicit install-leim dependence.
+
+ * Makefile.in (install-arch-indep):
+ Move last element of mkdir rule here.
+ (mkdir): Remove rule.
+
+ * Makefile.in (install-arch-indep): Remove unneeded chmods.
+ INSTALL_DATA does this for us.
+
+ * Makefile.in (install-arch-dep): Ensure bindir exists.
+ Drop mkdir dependency.
+ (install-arch-indep): Ensure docdir, infodir, mandir exist.
+ (install-leim): Drop mkdir dependency.
+ (mkdir): Remove most directories, now made in relevant rules.
+
+ * Makefile.in (install-arch-indep): Combine adjacent loops.
+
2012-05-17 Glenn Morris <rgm@gnu.org>
- * Makefile.in (install-arch-dep): For a self-contained ns build,
+ * Makefile.in (install-etc, mkdir):
+ Make relevant directories in install-etc rather than mkdir.
+
+ * Makefile.in (write_subdir): Create the directory if needed.
+ (install-arch-dep, mkdir): No need to make site-lisp directories.
+
+ * Makefile.in (write_subdir): New.
+ (install-arch-indep, install-arch-dep): Use $write_subdir.
+
+ * configure.in (docdir, etcdir, infodir, lispdir):
+ For a self-contained ns build, set these to the appropriate values.
+ * Makefile.in (install-arch-dep): No need to move info/ any more.
+
+ * configure.in (ns_self_contained): New output variable.
+ * Makefile.in (ns_self_contained): New, set by configure.
+ (install-arch-dep): For a self-contained ns build,
don't bother installing binaries then immediately deleting them.
* Makefile.in (ns_appbindir, ns_appresdir):