changeset 156:c2445b73a8b2

6949695 Would like to have perl 5.12 (use CONFIG_SHELL)
author Craig Mohrman <Craig.Mohrman@oracle.com>
date Mon, 28 Mar 2011 14:55:59 -0700
parents 0727b36f1770
children accde06c81c4
files components/perl512/Makefile make-rules/configure.mk make-rules/shared-macros.mk
diffstat 3 files changed, 4 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/components/perl512/Makefile	Mon Mar 28 13:31:10 2011 -0700
+++ b/components/perl512/Makefile	Mon Mar 28 14:55:59 2011 -0700
@@ -47,7 +47,8 @@
 	(cd $(@D); $(ENV) -i \
 		MAKE=$(GMAKE) \
 		PATH=$(dir $(CC.studio.32)):$(PATH) \
-		./Configure -Dprefix=/usr/perl5/$(PERL_VERSION) \
+		$(CONFIG_SHELL) ./Configure \
+			    -Dprefix=/usr/perl5/$(PERL_VERSION) \
 			    -Dprivlib=/usr/perl5/$(PERL_VERSION)/lib \
 			    -Dsitelib=/usr/perl5/site_perl/$(PERL_VERSION) \
 			    -Dvendorprefix=/usr/perl5/$(PERL_VERSION) \
--- a/make-rules/configure.mk	Mon Mar 28 13:31:10 2011 -0700
+++ b/make-rules/configure.mk	Mon Mar 28 14:55:59 2011 -0700
@@ -49,8 +49,6 @@
 #	COMPONENT_BUILD_TARGETS, COMPONENT_INSTALL_TARGETS
 #
 
-CONFIG_SHELL =	/bin/bash
-
 CONFIGURE_PREFIX =	/usr
 
 CONFIGURE_BINDIR.32 =	$(CONFIGURE_PREFIX)/bin
--- a/make-rules/shared-macros.mk	Mon Mar 28 13:31:10 2011 -0700
+++ b/make-rules/shared-macros.mk	Mon Mar 28 14:55:59 2011 -0700
@@ -62,6 +62,8 @@
 
 CLONEY =	$(WS_TOOLS)/cloney
 
+CONFIG_SHELL =	/bin/bash
+
 PKG_REPO =	file:$(WS_REPO)
 
 COMPONENT_DIR =	$(shell pwd)