[open-ils-commits] r17771 - branches/rel_2_0/Open-ILS/src/extras (dbs)

[svn at svn.open-ils.org]

Author: dbs
Date: 2010-09-17 13:58:24 -0400 (Fri, 17 Sep 2010)
New Revision: 17771

Modified:
   branches/rel_2_0/Open-ILS/src/extras/Makefile.install
Log:
Backport r17769 from trunk: use HTTP URLs to download prereqs to avoid protocol-blocking annoyances


Modified: branches/rel_2_0/Open-ILS/src/extras/Makefile.install
===================================================================
--- branches/rel_2_0/Open-ILS/src/extras/Makefile.install	2010-09-17 17:56:38 UTC (rev 17770)
+++ branches/rel_2_0/Open-ILS/src/extras/Makefile.install	2010-09-17 17:58:24 UTC (rev 17771)
@@ -35,8 +35,8 @@
 
 LIBJS=js-1.7.0
 LIBJS_PERL=JavaScript-SpiderMonkey-0.20
-LIBJS_URL=ftp://ftp.mozilla.org/pub/mozilla.org/js/$(LIBJS).tar.gz
-LIBJS_PERL_URL=ftp://mirror.datapipe.net/pub/CPAN/authors/id/T/TB/TBUSCH/$(LIBJS_PERL).tar.gz
+LIBJS_URL=http://ftp.mozilla.org/pub/mozilla.org/js/$(LIBJS).tar.gz
+LIBJS_PERL_URL=http://mirror.datapipe.net/pub/CPAN/authors/id/T/TB/TBUSCH/$(LIBJS_PERL).tar.gz
 # used for installing libjs lib and header files
 JS_INSTALL_PREFIX=/usr/
 
@@ -290,7 +290,9 @@
 	for m in $(CPAN_MODULES_MARC); do perl -MCPAN -e "install \"$$m\";"; done
 
 install_cpan_force:
-	for m in $(CPAN_MODULES_FORCE); do perl -MCPAN -e "force install \"$$m\";"; done
+	for m in $(CPAN_MODULES_FORCE); do \
+		echo "force install $$m" | perl -MCPAN -e shell ;\
+	done
 
 # Install the Safe Perl module
 # Is this really unpackaged everywhere except for Fedora?