install gdb and related info files

4 files changed, 12 insertions, 9 deletions

diff --git a/gnu/usr.bin/binutils/Makefile.bsd-wrapper b/gnu/usr.bin/binutils/Makefile.bsd-wrapper
index 12b73e9c398..6408ccbfe9d 100644
--- a/gnu/usr.bin/binutils/Makefile.bsd-wrapper
+++ b/gnu/usr.bin/binutils/Makefile.bsd-wrapper
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile.bsd-wrapper,v 1.22 1998/04/01 04:30:14 millert Exp $
+#	$OpenBSD: Makefile.bsd-wrapper,v 1.23 1998/05/18 00:43:21 marc Exp $
 
 SUBDIRS=	libiberty opcodes bfd
 MAN=
@@ -42,10 +42,10 @@ config: .FORCE
 .ifndef GLOBAL_AUTOCONF_CACHE
 	-rm -f config.cache
 .endif
-	sh ${.CURDIR}/configure --prefix=/usr --disable-gdbtk ${CF}
+	sh ${.CURDIR}/configure --prefix=/usr --infodir=/usr/share/info --disable-gdbtk ${CF}
 
 config.status:
-	sh ${.CURDIR}/configure --prefix=/usr --disable-gdbtk ${CF}
+	sh ${.CURDIR}/configure --prefix=/usr --infodir=/usr/share/info --disable-gdbtk ${CF}
 
 .ifdef NOMAN
 maninstall:
@@ -56,7 +56,7 @@ install: maninstall
 	${MAKE} prefix=${DESTDIR}/usr infodir=${DESTDIR}/usr/share/info \
 		bindir=${DESTDIR}/usr/bin INSTALL_MAN= SUBDIRS="${SUBDIRS}" \
 		ALL_MODULES="${ALL_MODULES}" INSTALL_MODULES="${INSTALL_MODULES}" \
-		install
+		install install-info
 
 clean cleandir:
 	-@if [ -e Makefile ]; then ${MAKE} distclean; fi
diff --git a/gnu/usr.bin/binutils/configure b/gnu/usr.bin/binutils/configure
index 115eed5e896..472cd9aeca3 100644
--- a/gnu/usr.bin/binutils/configure
+++ b/gnu/usr.bin/binutils/configure
@@ -80,7 +80,7 @@ subdirs=
 target_alias=NOTARGET
 target_makefile_frag=
 undefs=NOUNDEFS
-version="$Revision: 1.5 $"
+version="$Revision: 1.6 $"
 x11=default
 
 ### we might need to use some other shell than /bin/sh for running subshells
@@ -254,6 +254,9 @@ do
 		   ;;
 		esac
 		;;
+	--infodir*)
+		infodiroption="--infodir=$optarg"
+		;;
 	--tmpdir* | --tm*)
 		TMPDIR=$optarg
 		tmpdiroption="--tmpdir=$optarg"
@@ -508,7 +511,7 @@ case "`grep '^# per\-host:' ${srcdir}/configure.in`" in
 	    eval exec ${config_shell} ${srcdir}/configure ${verbose} \
 		${buildopt} --host=${host_alias} --target=${target_alias} \
 		${prefixoption} ${tmpdiroption} ${exec_prefixoption} \
-		${srcdiroption} \
+		${srcdiroption} ${infodiroption} \
 		${program_prefixoption} ${program_suffixoption} \
 		${program_transform_nameoption} ${site_option} \
 		${withoptions} ${withoutoptions} \
@@ -1276,7 +1279,7 @@ if [ -z "${norecursion}" -a -n "${configdirs}" ] ; then
 ### The recursion line is here.
 			if [ ! -z "${recprog}" ] ; then
 	                        if eval ${config_shell} ${recprog} ${verbose} ${buildopt} --host=${host_alias} --target=${target_alias} \
-        	                        ${prefixoption} ${tmpdiroption} ${exec_prefixoption} \
+        	                        ${prefixoption} ${tmpdiroption} ${exec_prefixoption} ${infodiroption} \
                 	                ${srcdiroption} ${program_prefixoption} ${program_suffixoption} ${program_transform_nameoption} ${site_option} ${withoptions} ${withoutoptions} ${enableoptions} ${disableoptions} ${floating_pointoption} ${cache_file_option} ${removing} ${other_options} ${redirect} ; then
 	                                true
         	                else
diff --git a/gnu/usr.bin/binutils/readline/Makefile.in b/gnu/usr.bin/binutils/readline/Makefile.in
index c7c439b17c3..4bf23f613e0 100644
--- a/gnu/usr.bin/binutils/readline/Makefile.in
+++ b/gnu/usr.bin/binutils/readline/Makefile.in
@@ -40,7 +40,7 @@ man6dir = $(mandir)/man6
 man7dir = $(mandir)/man7
 man8dir = $(mandir)/man8
 man9dir = $(mandir)/man9
-infodir = $(prefix)/info
+infodir = $(prefix)/share/info
 includedir = $(prefix)/include
 
 SHELL = /bin/sh
diff --git a/gnu/usr.bin/binutils/readline/doc/Makefile.in b/gnu/usr.bin/binutils/readline/doc/Makefile.in
index 451b9fec336..1202fcff0ee 100644
--- a/gnu/usr.bin/binutils/readline/doc/Makefile.in
+++ b/gnu/usr.bin/binutils/readline/doc/Makefile.in
@@ -20,7 +20,7 @@ srcdir = .
 
 prefix = /usr/local
 
-infodir = $(prefix)/info
+infodir = $(prefix)/share/info
 
 SHELL = /bin/sh