From 024f07906ff4d950ec8f4db554f3dbaf0affaa82 Mon Sep 17 00:00:00 2001
From: Douglas Guptill <douglas.guptill@dal.ca>
Date: Thu, 18 Jun 2009 15:39:57 +0000
Subject: [PATCH] change 'more' to
---
CASCADE/Makefile | 4 ++--
Makefile.mahone | 3 +++
Makefile.p690 | 3 +++
NN/Makefile | 8 ++++----
OCTREE/Makefile | 4 ++--
RESAMPLE/Makefile | 4 ++--
6 files changed, 16 insertions(+), 10 deletions(-)
diff --git a/CASCADE/Makefile b/CASCADE/Makefile
index 2c089e2a..e35b175f 100644
--- a/CASCADE/Makefile
+++ b/CASCADE/Makefile
@@ -66,7 +66,7 @@ distclean: objclean
more-output:
@echo "--"
@echo "compiler output from `pwd`"
- @if test -e $(COMPILE_OUT) ; then more $(COMPILE_OUT) ; fi
+ @if test -e $(COMPILE_OUT) ; then ${PAGER} $(COMPILE_OUT) ; fi
@echo "--"
@echo "$(AR) output from `pwd`"
- @if test -e $(LIBFILE).ar ; then more $(LIBFILE).ar ; fi
+ @if test -e $(LIBFILE).ar ; then ${PAGER} $(LIBFILE).ar ; fi
diff --git a/Makefile.mahone b/Makefile.mahone
index dc03918c..bb02cbcb 100644
--- a/Makefile.mahone
+++ b/Makefile.mahone
@@ -9,6 +9,9 @@ F90 = /usr/local/mpich.pgi.64/bin/mpif90
F77 = /usr/local/mpich.pgi.64/bin/mpif77
CC = /usr/local/mpich.pgi.64/bin/mpicc
+# The Makefiles look at compile output with this
+PAGER=less
+
# wsmp lives here.
#
WSMP_DIR = /home/dguptill/software/wsmp/wsmp-Linux/lib/X86_64/PGI
diff --git a/Makefile.p690 b/Makefile.p690
index 9464a360..f7111d8b 100644
--- a/Makefile.p690
+++ b/Makefile.p690
@@ -4,6 +4,9 @@ F90 = mpxlf90_r
F77 = mpxlf_r
CC = mpcc_r
+# The Makefiles look at compile output with this
+PAGER=more
+
# wsmp lives here.
#
WSMP_DIR = /home/beaumnt1/software/wsmp/lib/Power4
diff --git a/NN/Makefile b/NN/Makefile
index ee708304..d181f051 100644
--- a/NN/Makefile
+++ b/NN/Makefile
@@ -27,9 +27,9 @@ distclean: objclean
more-output:
@echo "--"
@echo "compiler output from `pwd`"
- @if test -e $(COMPILE_OUT)_f ; then more $(COMPILE_OUT)_f ; fi
- @if test -e $(COMPILE_OUT)_c ; then more $(COMPILE_OUT)_c ; fi
+ @if test -e $(COMPILE_OUT)_f ; then ${PAGER} $(COMPILE_OUT)_f ; fi
+ @if test -e $(COMPILE_OUT)_c ; then ${PAGER} $(COMPILE_OUT)_c ; fi
@echo "--"
@echo "$(AR) output from `pwd`"
- @if test -e $(LIBFILE_f).ar ; then more $(LIBFILE_f).ar ; fi
- @if test -e $(LIBFILE_c).ar ; then more $(LIBFILE_c).ar ; fi
+ @if test -e $(LIBFILE_f).ar ; then ${PAGER} $(LIBFILE_f).ar ; fi
+ @if test -e $(LIBFILE_c).ar ; then ${PAGER} $(LIBFILE_c).ar ; fi
diff --git a/OCTREE/Makefile b/OCTREE/Makefile
index 2791774c..49aa4396 100644
--- a/OCTREE/Makefile
+++ b/OCTREE/Makefile
@@ -29,7 +29,7 @@ distclean: objclean
more-output:
@echo "--"
@echo "compiler output from `pwd`"
- @if test -e $(COMPILE_OUT) ; then more $(COMPILE_OUT) ; fi
+ @if test -e $(COMPILE_OUT) ; then ${PAGER} $(COMPILE_OUT) ; fi
@echo "--"
@echo "$(AR) output from `pwd`"
- @if test -e $(LIBFILE).ar ; then more $(LIBFILE).ar ; fi
+ @if test -e $(LIBFILE).ar ; then ${PAGER} $(LIBFILE).ar ; fi
diff --git a/RESAMPLE/Makefile b/RESAMPLE/Makefile
index 61853869..d5c38b22 100644
--- a/RESAMPLE/Makefile
+++ b/RESAMPLE/Makefile
@@ -33,7 +33,7 @@ distclean: objclean
more-output:
@echo "--"
@echo "compiler output from `pwd`"
- @if test -e $(COMPILE_OUT) ; then more $(COMPILE_OUT) ; fi
+ @if test -e $(COMPILE_OUT) ; then ${PAGER} $(COMPILE_OUT) ; fi
@echo "--"
@echo "$(AR) output from `pwd`"
- @if test -e $(LIBFILE).ar ; then more $(LIBFILE).ar ; fi
+ @if test -e $(LIBFILE).ar ; then ${PAGER} $(LIBFILE).ar ; fi
--
GitLab