diff --git a/install/configure b/install/configure
index 2b6a11374..810d658da 100755
--- a/install/configure
+++ b/install/configure
@@ -10029,7 +10029,7 @@ fi
 # No lapack library found or internal lapack esplicitly required
 
 if test "$have_lapack" -eq 0 -o "$have_blas" -eq 0 -o "$use_netlib" -eq 1 ; then
-    lapack_libs="$topdir/LAPACK/liblapack.a $topdir/LAPACK/libblas.a"
+    lapack_libs="\$(TOPDIR)/LAPACK/liblapack.a \$(TOPDIR)/LAPACK/libblas.a"
     lapack_libs_switch="internal"
     blas_libs_switch="external"
 else
diff --git a/install/m4/x_ac_qe_lapack.m4 b/install/m4/x_ac_qe_lapack.m4
index 35b957670..96eb1e54b 100644
--- a/install/m4/x_ac_qe_lapack.m4
+++ b/install/m4/x_ac_qe_lapack.m4
@@ -131,7 +131,7 @@ fi
 # No lapack library found or internal lapack esplicitly required
 
 if test "$have_lapack" -eq 0 -o "$have_blas" -eq 0 -o "$use_netlib" -eq 1 ; then
-    lapack_libs="$topdir/LAPACK/liblapack.a $topdir/LAPACK/libblas.a"
+    lapack_libs="\$(TOPDIR)/LAPACK/liblapack.a \$(TOPDIR)/LAPACK/libblas.a"
     lapack_libs_switch="internal"
     blas_libs_switch="external"
 else
diff --git a/install/make_wannier90.inc.in b/install/make_wannier90.inc.in
index f95a0bc4c..f53e9ad4e 100644
--- a/install/make_wannier90.inc.in
+++ b/install/make_wannier90.inc.in
@@ -2,6 +2,8 @@
 # WANNIER90 	
 #=======================================
 
+TOPDIR = @topdir@
+
 F90=@mpif90@
 FCOPTS=@f90flags@ 
 LDOPTS=@ldflags@