Resync and/or copy from original sources.

1 files changed, 15 insertions, 11 deletions

diff --git a/lib/emacs/Makefile.in b/lib/emacs/Makefile.in
index cb156e6b..3c93454b 100644
--- a/lib/emacs/Makefile.in
+++ b/lib/emacs/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.7a from Makefile.am.
+# Makefile.in generated by automake 1.8.2 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
-# Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -35,12 +35,13 @@ NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
 subdir = lib/emacs
+DIST_COMMON = $(dist_lisp_LISP) $(srcdir)/Makefile.am \
+	$(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/config/m4.m4 \
 	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
-DIST_COMMON = $(dist_lisp_LISP) $(srcdir)/Makefile.in Makefile.am
 mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
 CONFIG_CLEAN_FILES =
 SOURCES =
@@ -90,6 +91,7 @@ STRIP = @STRIP@
 TEST_EMACS = @TEST_EMACS@
 VERSION = @VERSION@
 ac_ct_STRIP = @ac_ct_STRIP@
+ac_cv_sh_n_works = @ac_cv_sh_n_works@
 am__leading_dot = @am__leading_dot@
 bindir = @bindir@
 build_alias = @build_alias@
@@ -104,6 +106,7 @@ libexecdir = @libexecdir@
 lispdir = @lispdir@
 localstatedir = @localstatedir@
 mandir = @mandir@
+mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
@@ -116,7 +119,7 @@ all: all-am
 
 .SUFFIXES:
 .SUFFIXES: .el .elc
-$(srcdir)/Makefile.in:  Makefile.am  $(am__configure_deps)
+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
@@ -128,7 +131,8 @@ $(srcdir)/Makefile.in:  Makefile.am  $(am__configure_deps)
 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  lib/emacs/Makefile'; \
 	cd $(top_srcdir) && \
 	  $(AUTOMAKE) --gnu  lib/emacs/Makefile
-Makefile:  $(srcdir)/Makefile.in $(top_builddir)/config.status
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
 	  *config.status*) \
 	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
@@ -148,14 +152,14 @@ uninstall-info-am:
 
 elc-stamp: $(am__ELFILES)
 	@echo 'WARNING: Warnings can be ignored. :-)'
-	if test $(EMACS) != no; then \
+	if test "$(EMACS)" != no; then \
 	  set x; \
 	  list='$(am__ELFILES)'; for p in $$list; do \
 	    if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	    set x "$$@" "$$d$$p"; shift; \
 	  done; \
 	  shift; \
-	  EMACS=$(EMACS) $(SHELL) $(elisp_comp) "$$@" || exit 1; \
+	  EMACS="$(EMACS)" $(SHELL) $(elisp_comp) "$$@" || exit 1; \
 	else : ; fi
 	touch $@
 
@@ -167,7 +171,7 @@ elc-stamp: $(am__ELFILES)
 install-dist_lispLISP: $(dist_lisp_LISP) $(ELCFILES)
 	@$(NORMAL_INSTALL)
 	@if test "$(EMACS)" != no; then \
-	  $(mkinstalldirs) $(DESTDIR)$(lispdir); \
+	  $(mkdir_p) $(DESTDIR)$(lispdir); \
 	  list='$(dist_lisp_LISP)'; for p in $$list; do \
 	    if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	    f="`echo $$p | sed -e 's|^.*/||'`"; \
@@ -211,7 +215,7 @@ distdir: $(DISTFILES)
 	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
 	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
 	    dir="/$$dir"; \
-	    $(mkinstalldirs) "$(distdir)$$dir"; \
+	    $(mkdir_p) "$(distdir)$$dir"; \
 	  else \
 	    dir=''; \
 	  fi; \
@@ -230,7 +234,7 @@ check-am: all-am
 check: check-am
 all-am: Makefile $(LISP) elc-stamp $(ELCFILES)
 installdirs:
-	$(mkinstalldirs) $(DESTDIR)$(lispdir)
+	$(mkdir_p) $(DESTDIR)$(lispdir)
 install: install-am
 install-exec: install-exec-am
 install-data: install-data-am