--- a/components/texinfo/Makefile	Sun Jan 22 10:33:31 2012 -0800
+++ b/components/texinfo/Makefile	Tue Jan 24 07:17:12 2012 -0800
@@ -18,7 +18,7 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
 #
 include ../../make-rules/shared-macros.mk
 
@@ -34,8 +34,17 @@
 include ../../make-rules/configure.mk
 include ../../make-rules/ips.mk
 
+INFOPATH := /usr/share/info
+INFOPATH := $(INFOPATH):/usr/sfw/share/info
+INFOPATH := $(INFOPATH):/usr/gnu/share/info
+INFOPATH := $(INFOPATH):/usr/local/share/info
+INFOPATH := $(INFOPATH):.
+
+CPPFLAGS += -DDEFAULT_INFOPATH=\\\"$(INFOPATH)\\\"
+
 CONFIGURE_OPTIONS  +=		--infodir=$(CONFIGURE_INFODIR)
 CONFIGURE_OPTIONS  +=		CFLAGS="$(CFLAGS)"
+CONFIGURE_OPTIONS  +=		CPPFLAGS="$(CPPFLAGS)"
 
 # common targets
 build:		$(BUILD_32)