From 4d78ca217d775efe9e6e78fa16761cc8a530fa49 Mon Sep 17 00:00:00 2001
From: Eric Blake <eblake@redhat.com>
Date: Wed, 27 Jun 2012 16:59:21 -0600
Subject: [PATCH] maint: don't sync elisp-comp or missing from gnulib

Automake 1.13 will be changing the semantics of 'missing'; maintaining
our own copy in version control risks problems if our version does
not match automake's expectations.  As a result, gnulib no longer
mirrors 'missing'.  Furthermore, gnulib originally added the
'elisp-comp' module with the explanation that autoconf uses it, but
we don't use it anywhere other than the manner in which automake
will byte-compile our .el files; since we don't document the script,
we should be just fine using the version that was installed by automake.

See more discussion in the thread starting here:
https://lists.gnu.org/archive/html/automake-patches/2012-06/msg00154.html

* cfg.mk (gnulib-update): Drop files installed by automake and no
longer present in gnulib.
* .gitattributes: Delete references to files not in git.
---
 .gitattributes | 4 ----
 cfg.mk         | 2 --
 2 files changed, 6 deletions(-)

diff --git a/.gitattributes b/.gitattributes
index 80c4fdf1..c42b75da 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -5,10 +5,6 @@ ChangeLog	merge=merge-changelog
 # Exempt upstream files from whitespace rules.
 config.guess	-whitespace
 config.sub	-whitespace
-elisp-comp	-whitespace
-install-sh	-whitespace
-mdate-sh	-whitespace
-missing		-whitespace
 move-if-change	-whitespace
 texinfo.tex	-whitespace
 fdl.texi	-whitespace
diff --git a/cfg.mk b/cfg.mk
index 23ebe4ef..a992abba 100644
--- a/cfg.mk
+++ b/cfg.mk
@@ -54,14 +54,12 @@ gnulib-update:
 	cp $(gnulib_dir)/build-aux/announce-gen $(srcdir)/build-aux
 	cp $(gnulib_dir)/build-aux/config.guess $(srcdir)/build-aux
 	cp $(gnulib_dir)/build-aux/config.sub $(srcdir)/build-aux
-	cp $(gnulib_dir)/build-aux/elisp-comp $(srcdir)/build-aux
 	cp $(gnulib_dir)/build-aux/gendocs.sh $(srcdir)/build-aux
 	cp $(gnulib_dir)/build-aux/git-version-gen $(srcdir)/build-aux
 	cp $(gnulib_dir)/build-aux/gitlog-to-changelog $(srcdir)/build-aux
 	cp $(gnulib_dir)/build-aux/gnupload $(srcdir)/build-aux
 	cp $(gnulib_dir)/build-aux/install-sh $(srcdir)/build-aux
 	cp $(gnulib_dir)/build-aux/mdate-sh $(srcdir)/build-aux
-	cp $(gnulib_dir)/build-aux/missing $(srcdir)/build-aux
 	cp $(gnulib_dir)/build-aux/move-if-change $(srcdir)/build-aux
 	cp $(gnulib_dir)/build-aux/texinfo.tex $(srcdir)/build-aux
 	cp $(gnulib_dir)/build-aux/update-copyright $(srcdir)/build-aux