Skip to content

Commit 98644f3

Browse files
committed
Addressed a similar issue with Makefile.ext and configure that was reported by Sarat Sreepathi from ORNL.
git-svn-id: svn+ssh://software.sandia.gov/svn/hpcg/trunk@236 5e06a57e-6b39-4354-92a0-249a7d0c5410
1 parent ee37c0c commit 98644f3

File tree

2 files changed

+13
-16
lines changed

2 files changed

+13
-16
lines changed

Makefile.ext

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
# -*- Makefile -*-
22

3-
#arch = UNKNOWN
4-
setup_file = UNKNOWN
3+
arch = UNKNOWN
4+
setup_file = setup/Make.$(arch)
55

6-
#include setup/Make.$(arch)
76
include $(setup_file)
87

98

configure

Lines changed: 11 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -5,19 +5,18 @@ bld_path=`pwd`
55

66
#FIXME: need to check whether src and bld are the same (test f1 -ef f2)
77

8-
#if test x"$#" != x"1" -o x`echo "$1" | sed -e 's/arch=..*/arch=/'` != x"arch=" -o x`echo "$1" | sed -e 's/arch=//'` = "x" ; then
9-
# echo
10-
# echo Please specify '"'arch'"' argument, for example:
11-
# echo
12-
# echo $0 arch=Unix
13-
# echo
14-
# exit 127
15-
#fi
8+
if test x"$#" != x"1" -o x"$1" = "x" ; then
9+
echo
10+
echo Please specify '"'arch'"' argument, for example:
11+
echo
12+
echo $0 Unix
13+
echo
14+
exit 127
15+
fi
1616

17-
#arg_arch=`echo "$1" | sed -e 's/arch=//'`
17+
arg_arch="$1"
1818

19-
#setup_file=${src_path}/setup/Make.${arg_arch}
20-
setup_file="$1"
19+
setup_file=${src_path}/setup/Make.${arg_arch}
2120

2221
if test ! -f $setup_file ; then
2322
echo
@@ -32,8 +31,7 @@ if test -d $mkfile -o -f $mkfile ; then
3231
rm -rf $mkfile
3332
fi
3433

35-
#sed -e "s:HPCG_ROOT_PATH:${bld_path}:g" ${src_path}/Makefile.ext | sed -e "s:HPCG_SRC_PATH:${src_path}:g" | sed -e "s:UNKNOWN:${arg_arch}:" > $mkfile
36-
sed -e "s:HPCG_ROOT_PATH:${bld_path}:g" ${src_path}/Makefile.ext | sed -e "s:HPCG_SRC_PATH:${src_path}:g" | sed -e "s:UNKNOWN:${setup_file}:" > $mkfile
34+
sed -e "s:HPCG_ROOT_PATH:${bld_path}:g" ${src_path}/Makefile.ext | sed -e "s:HPCG_SRC_PATH:${src_path}:g" | sed -e "s:UNKNOWN:${arg_arch}:" > $mkfile
3735

3836
# creating missing directories
3937
for path in src testing bin setup

0 commit comments

Comments
 (0)