From 0c57d9da514bab450950059d87e85cbbe56f0089 Mon Sep 17 00:00:00 2001
From: Ismael Luceno
Date: Tue, 28 May 2019 19:18:00 +0200
Subject: netpipe: Simplify build and installation

---
 cluster/netpipe/BUILD   |  9 ++-------
 cluster/netpipe/DEPENDS |  4 ++--
 cluster/netpipe/HISTORY |  4 ++++
 cluster/netpipe/INSTALL | 16 ++++------------
 4 files changed, 12 insertions(+), 21 deletions(-)

(limited to 'cluster')

diff --git a/cluster/netpipe/BUILD b/cluster/netpipe/BUILD
index 8256aee304..fb8b8efd73 100755
--- a/cluster/netpipe/BUILD
+++ b/cluster/netpipe/BUILD
@@ -1,9 +1,4 @@
-make  tcp  &&
+OPTS+=" tcp"
 
-if spell_ok mpich; then
-  make  mpi 
-fi  &&
 
-if spell_ok pvm;  then
-  make pvm
-fi
+make CC="$CC" CFLAGS="$CFLAGS" $OPTS
diff --git a/cluster/netpipe/DEPENDS b/cluster/netpipe/DEPENDS
index d31575d4da..354c6583ee 100755
--- a/cluster/netpipe/DEPENDS
+++ b/cluster/netpipe/DEPENDS
@@ -1,2 +1,2 @@
-optional_depends  mpich    &&
-optional_depends  pvm
+optional_depends  mpich  mpi '' &&
+optional_depends  pvm    pvm ''
diff --git a/cluster/netpipe/HISTORY b/cluster/netpipe/HISTORY
index 58d3f5caf6..b27db492aa 100644
--- a/cluster/netpipe/HISTORY
+++ b/cluster/netpipe/HISTORY
@@ -1,3 +1,7 @@
+2019-05-28 Ismael Luceno <ismael@sourcemage.org>
+	* BUILD, DEPENDS, INSTALL: Simplify build and installation
+	  Install all the documentation
+
 2015-01-08 Ismael Luceno <ismael@sourcemage.org>
 	* DETAILS: updated spell to 3.7.2
 
diff --git a/cluster/netpipe/INSTALL b/cluster/netpipe/INSTALL
index a9c989b2cc..5c30c6849d 100755
--- a/cluster/netpipe/INSTALL
+++ b/cluster/netpipe/INSTALL
@@ -1,12 +1,4 @@
-install  -m 755  NPtcp      ${INSTALL_ROOT}/usr/bin  &&
-mkdir -p ${INSTALL_ROOT}/usr/share/doc/$SPELL/       &&
-install -m 0644 dox/netpipe_paper.ps                           \
-        ${INSTALL_ROOT}/usr/share/doc/$SPELL/netpipe_paper.ps  &&
-
-if spell_ok mpich; then
-  install  -m 755  NPmpi    ${INSTALL_ROOT}/usr/bin
-fi  &&
- 
-if spell_ok pvm; then
-  install  -m 755  NPpvm    ${INSTALL_ROOT}/usr/bin
-fi
+install -v -m755 -D -t "$INSTALL_ROOT/usr/bin" NP*
+install -v -m644 -D -t "$INSTALL_ROOT/usr/share/man/man1" dox/*.1
+install -v -m644 -D -t "$INSTALL_ROOT/usr/share/doc/$SPELL-$VERSION" \
+	dox/*.pdf dox/*.ps dox/README
-- 
cgit v1.2.3