Title: [opsview-perl] [701] Re-add --module-dir.
- Revision
- 701
- Author
- pknight
- Date
- 2012-07-19 17:34:50 +0100 (Thu, 19 Jul 2012)
Log Message
Re-add --module-dir.
Modified Paths
Modified: trunk/Makefile
===================================================================
--- trunk/Makefile 2012-07-19 16:09:26 UTC (rev 700)
+++ trunk/Makefile 2012-07-19 16:34:50 UTC (rev 701)
@@ -636,9 +636,9 @@
MAKE_MAKER_INSTALL=1 MAKEFLAGS= DESTDIR= PERL5LIB= ${CPANM} ${CPANM_ARGS} --mirror-only --force --patch-dir=patches ExtUtils::MakeMaker
# install selected modules
if [ "x${ONLY_MODULES}" != "x" ]; then \
- MAKEFLAGS= DESTDIR= PERL5LIB= ${CPANM} ${CPANM_ARGS} --mirror file://${WORKDIR}/cpanm/sources --mirror-only --force --patch-dir=patches ${ONLY_MODULES}; \
+ MAKEFLAGS= DESTDIR= PERL5LIB= ${CPANM} ${CPANM_ARGS} --mirror file://${WORKDIR}/cpanm/sources --mirror-only --module-dir=${WORKDIR}/cpanm/sources --force --patch-dir=patches ${ONLY_MODULES}; \
else \
- MAKEFLAGS= DESTDIR= PERL5LIB= ${CPANM} ${CPANM_ARGS} --mirror file://${WORKDIR}/cpanm/sources --mirror-only --force --patch-dir=patches ${PERL_MODULES}; \
+ MAKEFLAGS= DESTDIR= PERL5LIB= ${CPANM} ${CPANM_ARGS} --mirror file://${WORKDIR}/cpanm/sources --mirror-only --module-dir=${WORKDIR}/cpanm/sources --force --patch-dir=patches ${PERL_MODULES}; \
fi
# You have to set DESTDIR= and MAKEFILE= here because cpanm seems to use it later, thus creating two sets of DESTDIR locations
#chown -R ${USER}.${GROUP} ${DESTDIR}${prefix}
@@ -647,9 +647,9 @@
install-dev:
# You have to set DESTDIR= and MAKEFILE= here because cpanm seems to use it later, thus creating two sets of DESTDIR locations
if [ "x${ONLY_MODULES}" != "x" ]; then \
- MAKEFLAGS= DESTDIR= PERL5LIB= ${CPANM} ${CPANM_ARGS} --mirror-only --force --patch-dir=patches ${ONLY_MODULES}; \
+ MAKEFLAGS= DESTDIR= PERL5LIB= ${CPANM} ${CPANM_ARGS} --mirror http://search.cpan.org/CPAN --mirror-only --module-dir=${WORKDIR}/cpanm/sources --force --patch-dir=patches ${ONLY_MODULES}; \
else \
- MAKEFLAGS= DESTDIR= PERL5LIB= ${CPANM} ${CPANM_ARGS} --mirror-only --force --patch-dir=patches ${PERL_DEV_MODULES}; \
+ MAKEFLAGS= DESTDIR= PERL5LIB= ${CPANM} ${CPANM_ARGS} --mirror http://search.cpan.org/CPAN --mirror-only --module-dir=${WORKDIR}/cpanm/sources --force --patch-dir=patches ${PERL_DEV_MODULES}; \
fi
chown -R ${USER}.${GROUP} ${DESTDIR}${prefix}
$(MAKE) setup-links-root-dev
_______________________________________________
Opsview-checkins mailing list
[email protected]
http://lists.opsview.org/lists/listinfo/opsview-checkins
