--- a/components/indent/Makefile	Thu Feb 27 10:06:20 2014 -0600
+++ b/components/indent/Makefile	Thu Feb 27 14:02:18 2014 -0600
@@ -19,7 +19,7 @@
 # CDDL HEADER END
 
 #
-# Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
 #
 
 include ../../make-rules/shared-macros.mk
@@ -42,6 +42,7 @@
 COMPONENT_PRE_CONFIGURE_ACTION =	($(CLONEY) $(SOURCE_DIR) $(@D))
 
 CONFIGURE_OPTIONS +=	CFLAGS="$(CFLAGS)"
+CONFIGURE_OPTIONS +=	--infodir=$(CONFIGURE_INFODIR)
 
 ASLR_MODE = $(ASLR_ENABLE)
 

--- a/components/indent/indent.p5m	Thu Feb 27 10:06:20 2014 -0600
+++ b/components/indent/indent.p5m	Thu Feb 27 14:02:18 2014 -0600
@@ -18,7 +18,7 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
 #
 
 <transform file path=usr.*/man/.+ -> default mangler.man.stability volatile>
@@ -36,9 +36,8 @@
 set name=org.opensolaris.arc-caseid value=PSARC/2013/004
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 file usr/bin/$(MACH64)/indent path=usr/bin/indent
-file path=usr/doc/indent/indent.html
-file path=usr/info/dir
-file path=usr/info/indent.info
+file usr/doc/indent/indent.html path=usr/share/doc/indent/indent.html
+file path=usr/share/info/indent.info
 file path=usr/share/locale/ca/LC_MESSAGES/indent.mo
 file path=usr/share/locale/da/LC_MESSAGES/indent.mo
 file path=usr/share/locale/de/LC_MESSAGES/indent.mo