diff -r 3a6b9e3809f7 -r 34cc580c62c2 make-rules/intltool.mk
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/make-rules/intltool.mk	Mon Nov 23 15:33:43 2015 -0800
@@ -0,0 +1,29 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+#
+# This file sets up the necessary overrides for components that use intltool.
+#
+CONFIGURE_ENV += MSGFMT="/usr/bin/gmsgfmt"
+CONFIGURE_ENV += XGETTEXT="/usr/bin/gxgettext"
+CONFIGURE_ENV += ac_cv_path_XGETTEXT="/usr/bin/gxgettext"