unbreak MANPS builds;
ok espie

conflict resolution

brain-dead cvs conflict merge

Merge conflicts, and a few details:
- Makefile.bsd-wrapper: man pages, disable NLS for now.
- doc/Makefile.in: install man pages manually, remove buggy targets that
would break `make clean'.
- makein

Merge conflicts, and a few details:
- Makefile.bsd-wrapper: man pages, disable NLS for now.
- doc/Makefile.in: install man pages manually, remove buggy targets that
would break `make clean'.
- makeinfo/Makefile.in: shell failure ??? rework problematic line.
- util/texindex.c: let maketempname create the file, remove race condition.

show more ...

Upgrade to 3.12, merge with OpenBSD changes.

Import of FSF texinfo 3.12. This version creates empty info-dirs correctly.

Import of FSF texinfo 3.11