Make GNU style installation of manpages optional, like we do elsewhere.

2 files changed, 15 insertions, 3 deletions

diff --git a/gnu/usr.bin/binutils/gdb/Makefile.in b/gnu/usr.bin/binutils/gdb/Makefile.in
index 59fcb6b09de..991362e6959 100644
--- a/gnu/usr.bin/binutils/gdb/Makefile.in
+++ b/gnu/usr.bin/binutils/gdb/Makefile.in
@@ -496,6 +496,10 @@ YYOBJ = c-exp.tab.o f-exp.tab.o m2-exp.tab.o
 
 DISTSTUFF = $(YYFILES)
 
+# Target to use for installing unformatted man-pages.  Some systems may not
+# want them installed.
+INSTALL_MAN = install-man
+
 # Prevent Sun make from putting in the machine type.  Setting
 # TARGET_ARCH to nothing works for SunOS 3, 4.0, but not for 4.1.
 .c.o:
@@ -530,7 +534,7 @@ gdb.z:gdb.1
 # time it takes for make to check that all is up to date.
 # install-only is intended to address that need.
 install: all install-only
-install-only:
+install-only: $(INSTALL_MAN)
 	transformed_name=`t='$(program_transform_name)'; \
 			  echo gdb | sed -e $$t` ; \
 		if test "x$$transformed_name" = x; then \
@@ -539,7 +543,6 @@ install-only:
 		  true ; \
 		fi ; \
 		$(INSTALL_PROGRAM) gdb $(bindir)/$$transformed_name ; \
-		$(INSTALL_DATA) $(srcdir)/gdb.1 $(man1dir)/$$transformed_name.1
 	if [ x"$(ENABLE_GDBTK)" != x ] ; then \
 		  $(INSTALL_DATA) $(srcdir)/gdbtk.tcl $(datadir)/gdbtk.tcl ; \
 		else \
@@ -547,6 +550,9 @@ install-only:
 		fi
 	@$(MAKE) DO=install "DODIRS=$(SUBDIRS)" $(FLAGS_TO_PASS) subdir_do 
 
+install-man:
+	$(INSTALL_DATA) $(srcdir)/gdb.1 $(man1dir)/$$transformed_name.1
+
 uninstall: force
 	transformed_name=`t='$(program_transform_name)'; \
 			  echo gdb | sed -e $$t` ; \
diff --git a/gnu/usr.bin/binutils/gprof/Makefile.in b/gnu/usr.bin/binutils/gprof/Makefile.in
index a9bce7a3063..0fd09474fa0 100644
--- a/gnu/usr.bin/binutils/gprof/Makefile.in
+++ b/gnu/usr.bin/binutils/gprof/Makefile.in
@@ -51,6 +51,10 @@ OBJS=	$(MY_TARGET).o basic_blocks.o bsd_callg_bl.o call_graph.o \
 # Files that can be generated, but should be included in distribution.
 GEN_FILES = flat_bl.c bsd_callg_bl.c fsf_callg_bl.c
 
+# Target to use for installing unformatted man-pages.  Some systems may not
+# want them installed.
+INSTALL_MAN = install-man
+
 CFLAGS=-g -DDEBUG
 LDFLAGS=
 HLDFLAGS = @HLDFLAGS@
@@ -99,8 +103,10 @@ install-info: gprof.info
 		$(INSTALL_DATA) $$dir/$$i $(infodir)/$$i ; \
 	done
 
-install: all
+install: all $(INSTALL_MAN)
 	$(INSTALL_XFORM) gprof $(bindir)/gprof
+
+install-man:
 	$(INSTALL_XFORM1) $(srcdir)/gprof.1 $(man1dir)/gprof.1
 
 gprof:	$(OBJS) $(LIBDEPS)