--- a/usr/src/cmd/hplip/Makefile.sfw Mon Mar 21 01:03:46 2011 -0800
+++ b/usr/src/cmd/hplip/Makefile.sfw Mon Mar 21 01:49:39 2011 -0800
@@ -21,7 +21,7 @@
#
# Copyright (c) 2008, 2011, Oracle and/or its affiliates. All rights reserved.
#
-#ident "@(#)Makefile.sfw 1.4 11/01/21 SMI"
+#ident "@(#)Makefile.sfw 1.5 11/03/15 SMI"
include ../Makefile.cmd
# include ../Makefile.cmd.64
@@ -69,6 +69,7 @@
TARGET_ENV += LD_OPTIONS="$(LDLIBS) $(LDFLAGS) -lnsl"
TARGET_ENV += PATH="$(SRC)/tools:$(SFW_PATH)"
TARGET_ENV += MAKE="$(CCSMAKE)"
+TARGET_ENV += CONFIG_SHELL=$(CONFIG_SHELL)
all:= TARGET = all
install:= TARGET = -e install
@@ -144,7 +145,7 @@
# of the support used for CUPS and SANE.
#
$(VER)-hpijs/config.status: $(VER)-hpijs/configure
- (cd $(@D) ; env - $(TARGET_ENV) ./configure $(CONFIGURE_OPTIONS))
+ (cd $(@D) ; env - $(TARGET_ENV) $(CONFIG_SHELL) ./configure $(CONFIGURE_OPTIONS))
$(VER)-hpijs/configure: $(VER)/configure
($(RM) -r $(@D) ; mkdir $(@D))
@@ -152,7 +153,7 @@
$(TOUCH) $@
$(VER)/config.status: $(VER)/configure .WAIT $(VER)-hpijs/configure
- (cd $(VER) ; env - $(TARGET_ENV) ./configure $(CONFIGURE_OPTIONS))
+ (cd $(VER) ; env - $(TARGET_ENV) $(CONFIG_SHELL) ./configure $(CONFIGURE_OPTIONS))
$(VER)/configure: $(VER)/configure.in
(cd $(VER) ; aclocal-1.10; libtoolize --force; autoconf )