Skip to content

Commit a3b64d5

Browse files
committed
scripts: don't put "fi fi fi" on the same line
sh (not bash) doesn't like it Refs #675 Signed-off-by: Brice Goglin <[email protected]>
1 parent 4516949 commit a3b64d5

File tree

3 files changed

+23
-9
lines changed

3 files changed

+23
-9
lines changed

config/hwloc.m4

Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1041,7 +1041,9 @@ return 0;
10411041
AC_MSG_NOTICE([using default CUDA install path /usr/local/cuda ...])
10421042
HWLOC_CUDA_COMMON_LDFLAGS="-L/usr/local/cuda/lib64/ -L/usr/local/cuda/lib64/stubs/"
10431043
HWLOC_CUDA_COMMON_CPPFLAGS="-I/usr/local/cuda/include/"
1044-
fi fi fi
1044+
fi
1045+
fi
1046+
fi
10451047
10461048
AC_MSG_NOTICE([common CUDA/OpenCL/NVML CPPFLAGS: $HWLOC_CUDA_COMMON_CPPFLAGS])
10471049
AC_MSG_NOTICE([common CUDA/OpenCL/NVML LDFLAGS: $HWLOC_CUDA_COMMON_LDFLAGS])
@@ -1265,7 +1267,9 @@ char nvmlInit ();
12651267
AC_MSG_NOTICE([using standard ROCm install path $rocm_dir ...])
12661268
else
12671269
AC_MSG_NOTICE([assuming ROCm is installed in standard directories ...])
1268-
fi fi fi
1270+
fi
1271+
fi
1272+
fi
12691273
if test "x$rocm_dir" != x; then
12701274
if test -d "$rocm_dir/include/rocm_smi"; then
12711275
HWLOC_RSMI_CPPFLAGS="-I$rocm_dir/include/"
@@ -1593,7 +1597,8 @@ return clGetDeviceIDs(0, 0, 0, NULL, NULL);
15931597
requested_plugins=`echo $enable_plugins | sed -e 's/,/ /g'`
15941598
else
15951599
hwloc_have_plugins=no
1596-
fi fi
1600+
fi
1601+
fi
15971602
AC_MSG_RESULT($hwloc_have_plugins)
15981603
15991604
if test "x$hwloc_have_plugins" = xyes; then
@@ -1606,7 +1611,8 @@ return clGetDeviceIDs(0, 0, 0, NULL, NULL);
16061611
else if test "x$hwloc_windows" = "xyes"; then
16071612
AC_MSG_WARN([dlopen not supported on non-native Windows build, disabled by default.])
16081613
enable_plugin_dlopen=no
1609-
fi fi
1614+
fi
1615+
fi
16101616
fi
16111617
if test "x$enable_plugin_ltdl" = x; then
16121618
if test "x$hwloc_aix" = "xyes"; then
@@ -1615,7 +1621,8 @@ return clGetDeviceIDs(0, 0, 0, NULL, NULL);
16151621
else if test "x$hwloc_windows" = "xyes"; then
16161622
AC_MSG_WARN([ltdl not supported on non-native Windows build, disabled by default.])
16171623
enable_plugin_dlopen=no
1618-
fi fi
1624+
fi
1625+
fi
16191626
fi
16201627
16211628
# Look for dlopen
@@ -1648,7 +1655,8 @@ return clGetDeviceIDs(0, 0, 0, NULL, NULL);
16481655
AC_MSG_RESULT([none])
16491656
AC_MSG_WARN([Plugin support requested, but could not enable dlopen or ltdl])
16501657
AC_MSG_ERROR([Cannot continue])
1651-
fi fi
1658+
fi
1659+
fi
16521660
16531661
AC_DEFINE([HWLOC_HAVE_PLUGINS], 1, [Define to 1 if the hwloc library should support dynamically-loaded plugins])
16541662
fi

contrib/dist/publish_doc

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,10 @@ else if test -d "$dst/$EXAMPLE/"; then
2424
else
2525
echo "ERROR: Cannot find doc subdirectory in destination path."
2626
exit 1
27-
fi fi fi fi
27+
fi
28+
fi
29+
fi
30+
fi
2831
echo "Will copy documentation to $dst"
2932

3033
while test `pwd` != /; do
@@ -52,7 +55,9 @@ else if ! test -e doc/doxygen-doc/hwloc-letter.pdf; then
5255
else if ! test -d doc/www.open-mpi.org/html/; then
5356
echo "ERROR: doc/www.open-mpi.org/html/ not found."
5457
exit 1
55-
fi fi fi
58+
fi
59+
fi
60+
fi
5661

5762
echo "Installing hwloc-v${VERSION}-a4.pdf ..."
5863
cp -f doc/doxygen-doc/hwloc-a4.pdf "$dst/hwloc-v${VERSION}-a4.pdf"

utils/hwloc/hwloc-gather-topology.in

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -285,7 +285,8 @@ if ! test -d "$destdir/$basename/var/run/hwloc"; then
285285
ln -sr "$destdir/$basename/var/run/hwloc.HWLOC_DUMPED_HWDATA_DIR" "$destdir/$basename/var/run/hwloc"
286286
else if test -e "$destdir/$basename/$runstatedir/hwloc"; then
287287
ln -sr "$destdir/$basename/var/run/hwloc.runstatedir" "$destdir/$basename/var/run/hwloc"
288-
fi fi
288+
fi
289+
fi
289290
fi
290291

291292
# Gather cgroup/cpuset mntpnts

0 commit comments

Comments
 (0)