Index: /issm/trunk-jpl/m4/issm_options.m4
===================================================================
--- /issm/trunk-jpl/m4/issm_options.m4	(revision 27915)
+++ /issm/trunk-jpl/m4/issm_options.m4	(revision 27916)
@@ -2448,15 +2448,7 @@
 			if test -d "${FORTRAN_DIR}" || test -f "${FORTRAN_DIR}"; then
 				FORTRANDIR="${FORTRAN_DIR}"
-				if test -n "${FORTRAN_DIR}"; then
-					HAVEFORTRANDIR=yes
-				else
-					HAVEFORTRANDIR=no
-				fi
 				FORTRANLIB="${FORTRAN_LIB}"
 				AC_DEFINE([_HAVE_FORTRAN_], [1], [with Fortran library in ISSM src])
-				AC_SUBST([HAVEFORTRANDIR])
-				FORTRANLIB="${FORTRAN_LIB}"
-				AC_DEFINE([_HAVE_FORTRAN_], [1], [with Fortran library in ISSM src])
-				AC_SUBST([HAVEFORTRANDIR])
+				AM_CONDITIONAL([HAVE_FORTRANDIR], [test "x${FORTRANDIR}" != "x"])
 				AC_SUBST([FORTRANDIR])
 				AC_SUBST([FORTRANLIB])
Index: /issm/trunk-jpl/src/c/Makefile.am
===================================================================
--- /issm/trunk-jpl/src/c/Makefile.am	(revision 27915)
+++ /issm/trunk-jpl/src/c/Makefile.am	(revision 27916)
@@ -771,5 +771,5 @@
 else
 if MAC
-if HAVEFORTRANDIR
+if HAVE_FORTRANDIR
 AM_LDFLAGS += -Wl,-rpath,$(FORTRANDIR)
 endif