diff options
| author | Bill Wendling <wendling@ncsa.uiuc.edu> | 2003-11-04 18:10:59 (GMT) |
|---|---|---|
| committer | Bill Wendling <wendling@ncsa.uiuc.edu> | 2003-11-04 18:10:59 (GMT) |
| commit | bfbfda0cae28482357408b1020dfeebd4d0ba217 (patch) | |
| tree | 3ae8f9cd210105429997c9b4e56bba62fe8fb8fb /config | |
| parent | 5e835237bed01840bc750d7972ba8ed2c982b3f6 (diff) | |
| download | hdf5-bfbfda0cae28482357408b1020dfeebd4d0ba217.zip hdf5-bfbfda0cae28482357408b1020dfeebd4d0ba217.tar.gz hdf5-bfbfda0cae28482357408b1020dfeebd4d0ba217.tar.bz2 | |
[svn-r7816] Purpose:
Improvement
Description:
If the library is built in parallel mode, then name the "h5cc" and
"h5fc" programs "h5pcc" and "h5pfc" resp. This saves the user from
worrying about mixing serial and parallel builds of the library and
having to specify the pathnames and so-forth.
Platforms tested:
Linux (w/ parallel & Fortran)
Modi4 (w/ parallel & Fortran)
Sol (Serial & Fortran & C++)
Misc. update:
Updated release/docs/RELEASE
Diffstat (limited to 'config')
| -rw-r--r-- | config/commence.in | 1 | ||||
| -rw-r--r-- | config/conclude.in | 12 |
2 files changed, 12 insertions, 1 deletions
diff --git a/config/commence.in b/config/commence.in index ad1ff45..4d6b0c7 100644 --- a/config/commence.in +++ b/config/commence.in @@ -35,6 +35,7 @@ CP=cp INSTALL=@INSTALL@ INSTALL_PROGRAM=@INSTALL_PROGRAM@ INSTALL_DATA=@INSTALL_DATA@ +PARALLEL=@PARALLEL@ RUNSERIAL=@RUNSERIAL@ RUNPARALLEL=@RUNPARALLEL@ RUNTEST=$(RUNSERIAL) diff --git a/config/conclude.in b/config/conclude.in index 5ab9a1b..50f0de4 100644 --- a/config/conclude.in +++ b/config/conclude.in @@ -180,7 +180,17 @@ install: $(AUX_LIB) $(PUB_LIB) $(PUB_HDR) $(PUB_PROGS) $(libdir) $(includedir) $ done @for f in X $(PUB_PROGS); do \ if test $$f != X; then \ - ($(LT_INSTALL_PROG) $$f $(bindir)/. || exit 1); \ + if test "X$(PARALLEL)" != "Xno"; then \ + if test $$f = "h5cc"; then \ + ($(LT_INSTALL_PROG) $$f $(bindir)/h5pcc || exit 1); \ + elif test $$f = "h5fc"; then \ + ($(LT_INSTALL_PROG) $$f $(bindir)/h5pfc || exit 1); \ + else \ + ($(LT_INSTALL_PROG) $$f $(bindir)/. || exit 1); \ + fi; \ + else \ + ($(LT_INSTALL_PROG) $$f $(bindir)/. || exit 1); \ + fi; \ fi; \ done @for d in X $(SUBDIRS); do \ |