Stop keeping info/dir in the repository.

* build-aux/dir_top: Move here from admin/.

* build-aux/make-info-dir: New script.

* Makefile.in (bootstrap-clean): Delete info/.
(info-dir, ${srcdir}/info/dir): New rules.
(info): Also make info-dir.
(check-info): Rename from check-info-dir.
Instead of info/dir entries, check @dircategory in info/*.info.

* make-dist: Use `info' rule rather than `info-real'.
No more info/COPYING (not even the right license for info/ files).

* info/: Remove from repository.

* admin/update_autogen (info_dir):
Use dir_top from build-aux/ rather than admin/.

* .bzrignore: Ignore info/ altogether.

* doc/emacs/Makefile.in: Comment.

3 files changed, 8 insertions, 24 deletions

diff --git a/admin/ChangeLog b/admin/ChangeLog
index b617df9be99..e31c7251ffb 100644
--- a/admin/ChangeLog
+++ b/admin/ChangeLog
@@ -1,5 +1,8 @@
 2013-12-12  Glenn Morris  <rgm@gnu.org>
 
+        * update_autogen (info_dir):
+        Use dir_top from build-aux/ rather than admin/.
+
         * update_autogen: Add option to generate info/dir.
         (Usage): Add -I.
         (info_flag): New variable.
diff --git a/admin/dir_top b/admin/dir_top
deleted file mode 100644
index 321a39dc35e..00000000000
--- a/admin/dir_top
+++ /dev/null
@@ -1,20 +0,0 @@
-This is the file .../info/dir, which contains the
-topmost node of the Info hierarchy, called (dir)Top.
-The first time you invoke Info you start off looking at this node.
-
-File: dir,      Node: Top       This is the top of the INFO tree
-
-The Info Directory
-******************
-
-  The Info Directory is the top-level menu of major Info topics.
-  Type "d" in Info to return to the Info Directory.  Type "q" to exit Info.
-  Type "?" for a list of Info commands, or "h" to visit an Info tutorial.
-  Type "m" to choose a menu item--for instance,
-    "mEmacs<Return>" visits the Emacs manual.
-  In Emacs Info, you can click mouse button 2 on a menu item
-  or cross reference to follow it to its target.
-  Each menu line that starts with a * is a topic you can select with "m".
-  Every third topic has a red * to help pick the right number to type.
-
-* Menu:
diff --git a/admin/update_autogen b/admin/update_autogen
index 918106b5efa..154c184a068 100755
--- a/admin/update_autogen
+++ b/admin/update_autogen
@@ -212,11 +212,11 @@ commit ()
 }                               # function commit
 
 
-## FIXME use standard tools for this, generate info/dir at build time
-## if needed, stop keeping in the repo.
+## No longer used since info/dir is now generated at install time if needed,
+## and is not in the repository any more.
 info_dir ()
 {
-    local basefile=admin/dir_top outfile=info/dir
+    local basefile=build-aux/dir_top outfile=info/dir
 
     echo "Regenerating info/dir..."
 
@@ -247,7 +247,8 @@ EOF
 
             dircat=`sed -n -e 's/@value{emacsname}/Emacs/' -e 's/^@dircategory //p' $file`
 
-            ## TODO warn about unknown topics.
+            ## TODO warn about unknown topics (check-info in top-level
+            ## Makefile does this).
             [ "$dircat" = "$topic" ] || continue
 
             sed -n -e 's/@value{emacsname}/Emacs/' \