From 7bf3aa1dbe4fd4fa808e8b1a02fe410a0797388f Mon Sep 17 00:00:00 2001 From: dmcmahill Date: Mon, 26 Jul 2004 11:14:28 +0000 Subject: change the order in do-install: a bit to install libtool libraries before binaries which link to them. --- parallel/pvm3/Makefile | 37 +++++++++++++++++++------------------ 1 file changed, 19 insertions(+), 18 deletions(-) (limited to 'parallel') diff --git a/parallel/pvm3/Makefile b/parallel/pvm3/Makefile index 86c5d0552ff..a80f5537df2 100644 --- a/parallel/pvm3/Makefile +++ b/parallel/pvm3/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.31 2004/07/19 22:41:16 dmcmahill Exp $ +# $NetBSD: Makefile,v 1.32 2004/07/26 11:14:28 dmcmahill Exp $ DISTNAME= pvm3.4.4 PKGNAME= pvm-3.4.4 @@ -50,6 +50,24 @@ pre-install: ${RM} -f ${WRKSRC}/man/man1/pvm_intro.1.orig do-install: + ${INSTALL_PROGRAM_DIR} ${PVM_DIR}/lib/${PVM_ARCH} +.for __tmp__ in libgpvm3.la libpvm3.la libpvmtrc.la libfpvm3.la + ${LIBTOOL} --mode=install ${INSTALL_PROGRAM} \ + ${WRKSRC}/lib/${PVM_ARCH}/${__tmp__} ${PVM_DIR}/lib/${PVM_ARCH} +.endfor +.for __tmp__ in pvm pvmgs + ${LIBTOOL} --mode=install ${INSTALL_PROGRAM} \ + ${WRKSRC}/lib/${PVM_ARCH}/${__tmp__} ${PVM_DIR}/lib/${PVM_ARCH}/ +.endfor + ${INSTALL_PROGRAM} ${WRKSRC}/lib/${PVM_ARCH}/pvmd3 \ + ${PVM_DIR}/lib/${PVM_ARCH} + ${LIBTOOL} --mode=finish ${PVM_DIR}/lib/${PVM_ARCH} + for f in `${LS} -1 ${WRKSRC}/lib`; do \ + if [ -f ${WRKSRC}/lib/$$f ]; then \ + ${INSTALL_SCRIPT} ${WRKSRC}/lib/$$f ${PVM_DIR}/lib; \ + fi; \ + done + ${INSTALL_PROGRAM_DIR} ${PVM_DIR}/bin/${PVM_ARCH} for f in ${WRKSRC}/bin/${PVM_ARCH}/* ; do \ ${ECHO} "Installing $$f" ; \ @@ -75,23 +93,6 @@ do-install: ${INSTALL_DATA_DIR} ${PVM_DIR}/include ${INSTALL_DATA} ${WRKSRC}/include/* ${PVM_DIR}/include - ${INSTALL_PROGRAM_DIR} ${PVM_DIR}/lib/${PVM_ARCH} -.for __tmp__ in pvm pvmgs - ${LIBTOOL} --mode=install ${INSTALL_PROGRAM} \ - ${WRKSRC}/lib/${PVM_ARCH}/${__tmp__} ${PVM_DIR}/lib/${PVM_ARCH}/ -.endfor - ${INSTALL_PROGRAM} ${WRKSRC}/lib/${PVM_ARCH}/pvmd3 \ - ${PVM_DIR}/lib/${PVM_ARCH} -.for __tmp__ in libgpvm3.la libpvm3.la libpvmtrc.la libfpvm3.la - ${LIBTOOL} --mode=install ${INSTALL_PROGRAM} \ - ${WRKSRC}/lib/${PVM_ARCH}/${__tmp__} ${PVM_DIR}/lib/${PVM_ARCH} -.endfor - ${LIBTOOL} --mode=finish ${PVM_DIR}/lib/${PVM_ARCH} - for f in `${LS} -1 ${WRKSRC}/lib`; do \ - if [ -f ${WRKSRC}/lib/$$f ]; then \ - ${INSTALL_SCRIPT} ${WRKSRC}/lib/$$f ${PVM_DIR}/lib; \ - fi; \ - done ${INSTALL_MAN_DIR} ${PREFIX}/man/man1 ${INSTALL_MAN_DIR} ${PREFIX}/man/man3 -- cgit v1.2.3