From d4551a16f7831e5b2742c538bd9375786564e7df Mon Sep 17 00:00:00 2001 From: dbs Date: Fri, 17 Sep 2010 17:58:24 +0000 Subject: [PATCH] Backport r17769 from trunk: use HTTP URLs to download prereqs to avoid protocol-blocking annoyances git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_2_0@17771 dcc99617-32d9-48b4-a31d-7c20da2025e4 --- Open-ILS/src/extras/Makefile.install | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/Open-ILS/src/extras/Makefile.install b/Open-ILS/src/extras/Makefile.install index 6c7161f948..9944ac1af3 100644 --- a/Open-ILS/src/extras/Makefile.install +++ b/Open-ILS/src/extras/Makefile.install @@ -35,8 +35,8 @@ SHELL=/bin/bash 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 @@ install_cpan_marc: 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? -- 2.11.0