diff options
| author | Glenn Morris <rgm@gnu.org> | 2013-12-12 00:54:21 -0800 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2013-12-12 00:54:21 -0800 |
| commit | 62bd73fa7a8c50504bc6f916b86603ea654fc472 (patch) | |
| tree | c0f269198491a68fe4fbedcb9a95ddf11c4ac600 /admin/update_autogen | |
| parent | 397a32c12ad097314c0948818d5c54b43d9f3d54 (diff) | |
| download | emacs-62bd73fa7a8c50504bc6f916b86603ea654fc472.tar.gz | |
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.
Diffstat (limited to 'admin/update_autogen')
| -rwxr-xr-x | admin/update_autogen | 9 |
1 files changed, 5 insertions, 4 deletions
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/' \ |