summaryrefslogtreecommitdiffstats
path: root/fortran
diff options
context:
space:
mode:
authorLarry Knox <lrknox@hdfgroup.org>2015-04-02 21:07:53 (GMT)
committerLarry Knox <lrknox@hdfgroup.org>2015-04-02 21:07:53 (GMT)
commit3032f3adf388e74935d19b6e00ee1637123d1682 (patch)
tree836df7aff039bcb4beb30034ec24001cbe4d0e3a /fortran
parent33c8035f0e8cd62b0fc4b5100f922426b1b77a8f (diff)
downloadhdf5-3032f3adf388e74935d19b6e00ee1637123d1682.zip
hdf5-3032f3adf388e74935d19b6e00ee1637123d1682.tar.gz
hdf5-3032f3adf388e74935d19b6e00ee1637123d1682.tar.bz2
[svn-r26711] Recommitting revisions 26669 and 26670, removing VPATH and redundant /usr/include and lib in fcompile and link flags checks, now that I have run reconfigure.
Also changed paths to h5cc, etc. in scripts to run installed examples from relative paths to absolute paths. Tested with h5committest.
Diffstat (limited to 'fortran')
-rw-r--r--fortran/Makefile.in1
-rw-r--r--fortran/examples/Makefile.in1
-rw-r--r--fortran/examples/run-fortran-ex.sh.in2
-rw-r--r--fortran/src/Makefile.in1
-rw-r--r--fortran/test/Makefile.in1
-rw-r--r--fortran/testpar/Makefile.in1
6 files changed, 1 insertions, 6 deletions
diff --git a/fortran/Makefile.in b/fortran/Makefile.in
index 7b7ae93..55ede05 100644
--- a/fortran/Makefile.in
+++ b/fortran/Makefile.in
@@ -466,7 +466,6 @@ H5_CXXFLAGS = @H5_CXXFLAGS@
H5_FCFLAGS = @H5_FCFLAGS@
H5_FORTRAN_SHARED = @H5_FORTRAN_SHARED@
H5_LDFLAGS = @H5_LDFLAGS@
-H5_LONE_COLON = @H5_LONE_COLON@
H5_VERSION = @H5_VERSION@
HADDR_T = @HADDR_T@
HAVE_DMALLOC = @HAVE_DMALLOC@
diff --git a/fortran/examples/Makefile.in b/fortran/examples/Makefile.in
index 59b6482..dd2fb46 100644
--- a/fortran/examples/Makefile.in
+++ b/fortran/examples/Makefile.in
@@ -418,7 +418,6 @@ H5_CXXFLAGS = @H5_CXXFLAGS@
H5_FCFLAGS = @H5_FCFLAGS@
H5_FORTRAN_SHARED = @H5_FORTRAN_SHARED@
H5_LDFLAGS = @H5_LDFLAGS@
-H5_LONE_COLON = @H5_LONE_COLON@
H5_VERSION = @H5_VERSION@
HADDR_T = @HADDR_T@
HAVE_DMALLOC = @HAVE_DMALLOC@
diff --git a/fortran/examples/run-fortran-ex.sh.in b/fortran/examples/run-fortran-ex.sh.in
index ead7361..a4d4550 100644
--- a/fortran/examples/run-fortran-ex.sh.in
+++ b/fortran/examples/run-fortran-ex.sh.in
@@ -34,7 +34,7 @@ EXIT_FAILURE=1
# Where the tool is installed.
# default is relative path to installed location of the tools
-prefix="${prefix:-../../../}"
+prefix="${prefix:-@prefix@}"
PARALLEL=@PARALLEL@ # Am I in parallel mode?
AR="@AR@"
RANLIB="@RANLIB@"
diff --git a/fortran/src/Makefile.in b/fortran/src/Makefile.in
index a17d39f..345ebe7 100644
--- a/fortran/src/Makefile.in
+++ b/fortran/src/Makefile.in
@@ -527,7 +527,6 @@ H5_CXXFLAGS = @H5_CXXFLAGS@
H5_FCFLAGS = @H5_FCFLAGS@
H5_FORTRAN_SHARED = @H5_FORTRAN_SHARED@
H5_LDFLAGS = @H5_LDFLAGS@
-H5_LONE_COLON = @H5_LONE_COLON@
H5_VERSION = @H5_VERSION@
HADDR_T = @HADDR_T@
HAVE_DMALLOC = @HAVE_DMALLOC@
diff --git a/fortran/test/Makefile.in b/fortran/test/Makefile.in
index 6cd8d66..4ec1ad5 100644
--- a/fortran/test/Makefile.in
+++ b/fortran/test/Makefile.in
@@ -536,7 +536,6 @@ H5_CXXFLAGS = @H5_CXXFLAGS@
H5_FCFLAGS = @H5_FCFLAGS@
H5_FORTRAN_SHARED = @H5_FORTRAN_SHARED@
H5_LDFLAGS = @H5_LDFLAGS@
-H5_LONE_COLON = @H5_LONE_COLON@
H5_VERSION = @H5_VERSION@
HADDR_T = @HADDR_T@
HAVE_DMALLOC = @HAVE_DMALLOC@
diff --git a/fortran/testpar/Makefile.in b/fortran/testpar/Makefile.in
index df58a28..f16dfff 100644
--- a/fortran/testpar/Makefile.in
+++ b/fortran/testpar/Makefile.in
@@ -462,7 +462,6 @@ H5_CXXFLAGS = @H5_CXXFLAGS@
H5_FCFLAGS = @H5_FCFLAGS@
H5_FORTRAN_SHARED = @H5_FORTRAN_SHARED@
H5_LDFLAGS = @H5_LDFLAGS@
-H5_LONE_COLON = @H5_LONE_COLON@
H5_VERSION = @H5_VERSION@
HADDR_T = @HADDR_T@
HAVE_DMALLOC = @HAVE_DMALLOC@