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.

1 files changed, 0 insertions, 0 deletions

diff --git a/gnu/usr.bin/texinfo/po/ChangeLog b/gnu/usr.bin/texinfo/po/ChangeLog
deleted file mode 100644
index e69de29bb2d..00000000000
--- a/gnu/usr.bin/texinfo/po/ChangeLog
+++ /dev/null