man page fixes from niklas

4 files changed, 28 insertions, 11 deletions

diff --git a/gnu/usr.bin/binutils/binutils/Makefile.in b/gnu/usr.bin/binutils/binutils/Makefile.in
index 0f475dd87bd..ea2db2f2561 100644
--- a/gnu/usr.bin/binutils/binutils/Makefile.in
+++ b/gnu/usr.bin/binutils/binutils/Makefile.in
@@ -109,6 +109,10 @@ SRCONV_PROG=srconv sysdump coffdump
 
 MANPAGES= ar nm objdump ranlib size strings strip objcopy nlmconv
 
+# Target to use for installing unformatted man-pages.  Some systems may not
+# want them installed.
+INSTALL_MAN = install-man
+
 PROGS = $(SIZE_PROG) $(OBJDUMP_PROG) $(NM_PROG) $(AR_PROG) $(STRINGS_PROG) $(STRIP_PROG) $(RANLIB_PROG) $(DEMANGLER_PROG) $(OBJCOPY_PROG) @BUILD_NLMCONV@ @BUILD_SRCONV@ @BUILD_DLLTOOL@
 STAGESTUFF = $(PROGS) *.o
 # Files that can be generated, but should be in the distribution.
@@ -536,16 +540,10 @@ etags tags: TAGS
 TAGS: force
 	etags $(INCDIR)/*.h $(srcdir)/*.[hc] 
 
-install: all
+install: all $(INSTALL_MAN)
 	for i in $(PROGS) ; do \
 	  $(INSTALL_XFORM) $$i $(bindir)/`echo $$i | sed -e 's/.new//'` ; \
 	done
-	for i in $(MANPAGES) ; do \
-	  $(INSTALL_XFORM1) $(srcdir)/$$i.1 $(man1dir)/$$i.1 ; \
-	done
-	if [ x$(DEMANGLER_PROG) != x ]; then \
-	  $(INSTALL_XFORM1) $(DEMANGLER_PROG).1 $(man1dir)/$(DEMANGLER_PROG).1; \
-	fi
 	test -d $(tooldir) || mkdir $(tooldir)
 	test -d $(tooldir)/bin || mkdir $(tooldir)/bin
 	for i in $(TOOL_PROGS) ; do \
@@ -558,6 +556,14 @@ install: all
 	  fi; \
 	done
 
+install-man:
+	for i in $(MANPAGES) ; do \
+	  $(INSTALL_XFORM1) $(srcdir)/$$i.1 $(man1dir)/$$i.1 ; \
+	done
+	if [ x$(DEMANGLER_PROG) != x ]; then \
+	  $(INSTALL_XFORM1) $(DEMANGLER_PROG).1 $(man1dir)/$(DEMANGLER_PROG).1; \
+	fi
+
 # This little path search is required because in the FSF net releases,
 # the info files are included in the source tree, and that may not be
 # the same as the build directory.
diff --git a/gnu/usr.bin/binutils/etc/Makefile.in b/gnu/usr.bin/binutils/etc/Makefile.in
index 829bf621c7f..907fc8613db 100644
--- a/gnu/usr.bin/binutils/etc/Makefile.in
+++ b/gnu/usr.bin/binutils/etc/Makefile.in
@@ -41,9 +41,15 @@ TEXIDIR = $(srcdir)/../texinfo
 INFOFILES = configure.info standards.info cfg-paper.info
 DVIFILES = configure.dvi standards.dvi cfg-paper.dvi
 
+# Target to use for installing unformatted man-pages.  Some systems may not
+# want them installed.
+INSTALL_MAN = install-man
+
 all:
 
-install:  $(srcdir)/configure.man
+install: $(INSTALL_MAN)
+
+install-man: $(srcdir)/configure.man
 	$(INSTALL_DATA) $(srcdir)/configure.man $(man1dir)/configure.1
 
 uninstall:
diff --git a/gnu/usr.bin/binutils/gas/Makefile.in b/gnu/usr.bin/binutils/gas/Makefile.in
index ee8433e5d9c..6798d6d8f42 100644
--- a/gnu/usr.bin/binutils/gas/Makefile.in
+++ b/gnu/usr.bin/binutils/gas/Makefile.in
@@ -448,7 +448,6 @@ maintainer-clean realclean: clean-here
 install: $(INSTALL_MAN)
 	srcroot=`cd $(srcroot); pwd`; export srcroot; \
 	$(INSTALL_XFORM) as.new $(bindir)/as; \
-	$(INSTALL_XFORM1) $(srcdir)/doc/as.1 $(man1dir)/as.1; \
 	test -d $(tooldir) || mkdir $(tooldir); \
 	test -d $(tooldir)/bin || mkdir $(tooldir)/bin; \
 	n=`echo as | sed '$(program_transform_name)'`; \
diff --git a/gnu/usr.bin/binutils/ld/Makefile.in b/gnu/usr.bin/binutils/ld/Makefile.in
index 69c471de422..42e66f2a2bb 100644
--- a/gnu/usr.bin/binutils/ld/Makefile.in
+++ b/gnu/usr.bin/binutils/ld/Makefile.in
@@ -171,6 +171,10 @@ CXX_FOR_TARGET = ` \
 # install.
 LD_PROG	= ld.new
 
+# Target to use for installing unformatted man-pages.  Some systems may not
+# want them installed.
+INSTALL_MAN = install-man
+
 all: $(LD_PROG)
 .PHONY: all
 
@@ -918,9 +922,8 @@ TAGS:
 	etags -t $(srcdir)/*.[chly] *.[chly]
 
 
-install: 
+install: $(INSTALL_MAN)
 	$(INSTALL_XFORM) ld.new $(bindir)/ld
-	$(INSTALL_XFORM1) $(srcdir)/ld.1 $(man1dir)/ld.1
 	for f in ldscripts/*; do \
 	  $(INSTALL_DATA) $$f $(scriptdir)/$$f ; \
 	done
@@ -931,6 +934,9 @@ install:
 	  ln $(bindir)/$$n $(tooldir)/bin/ld >/dev/null 2>/dev/null \
 	   || $(INSTALL_PROGRAM) ld.new $(tooldir)/bin/ld
 
+install-man:
+	$(INSTALL_XFORM1) $(srcdir)/ld.1 $(man1dir)/ld.1
+
 install-info: ld.info
 	if [ -r ld.info ]; then \
 	  dir=. ; \