--- a/components/gdb/Makefile Tue Jul 05 19:16:33 2011 -0700
+++ b/components/gdb/Makefile Tue Jul 05 20:59:09 2011 -0700
@@ -64,6 +64,7 @@
CONFIGURE_OPTIONS += --with-x=no
CONFIGURE_OPTIONS += --with-curses
CONFIGURE_OPTIONS += --with-libexpat-prefix=/usr/lib
+CONFIGURE_OPTIONS += --infodir=$(CONFIGURE_INFODIR)
# common targets
build: $(BUILD_64)
--- a/components/gdb/gdb.p5m Tue Jul 05 19:16:33 2011 -0700
+++ b/components/gdb/gdb.p5m Tue Jul 05 20:59:09 2011 -0700
@@ -33,8 +33,8 @@
dir path=usr
dir path=usr/bin
-dir path=usr/info
dir path=usr/share
+dir path=usr/share/info
dir path=usr/share/locale
dir path=usr/share/locale/da
dir path=usr/share/locale/da/LC_MESSAGES
@@ -72,20 +72,18 @@
dir path=usr/share/man/man1
file usr/bin/$(MACH64)/gdb path=/usr/bin/gdb
file usr/bin/$(MACH64)/gdbtui path=/usr/bin/gdbtui
-file path=usr/info/annotate.info
-file path=usr/info/bfd.info
-file path=usr/info/configure.info
-file path=usr/info/dir
-file path=usr/info/gdb.info
-file path=usr/info/gdb.info-1
-file path=usr/info/gdb.info-2
-file path=usr/info/gdb.info-3
-file path=usr/info/gdb.info-4
-file path=usr/info/gdbint.info
-file path=usr/info/gdbint.info-1
-file path=usr/info/gdbint.info-2
-file path=usr/info/stabs.info
-file path=usr/info/standards.info
+file path=usr/share/info/annotate.info
+file path=usr/share/info/bfd.info
+file path=usr/share/info/configure.info
+file path=usr/share/info/gdb.info
+file path=usr/share/info/gdb.info-1
+file path=usr/share/info/gdb.info-2
+file path=usr/share/info/gdb.info-3
+file path=usr/share/info/gdb.info-4
+file path=usr/share/info/gdbint.info
+file path=usr/share/info/gdbint.info-1
+file path=usr/share/info/gdbint.info-2
+file path=usr/share/info/stabs.info
file path=usr/share/locale/da/LC_MESSAGES/bfd.mo
file path=usr/share/locale/da/LC_MESSAGES/opcodes.mo
file path=usr/share/locale/de/LC_MESSAGES/opcodes.mo
--- a/components/texinfo/texinfo.p5m Tue Jul 05 19:16:33 2011 -0700
+++ b/components/texinfo/texinfo.p5m Tue Jul 05 20:59:09 2011 -0700
@@ -40,13 +40,11 @@
dir path=lib/svc/method
dir path=usr
dir path=usr/bin
-dir path=usr/info
dir path=usr/sfw
dir path=usr/sfw/bin
dir path=usr/sfw/share
dir path=usr/sfw/share/info
dir path=usr/share
-dir path=usr/share
dir path=usr/share/info
dir path=usr/share/locale
dir path=usr/share/locale/cs