diff --git a/src/config/makefile.h b/src/config/makefile.h
index 74e53eaafc..6b6cd907b8 100644
--- a/src/config/makefile.h
+++ b/src/config/makefile.h
@@ -314,15 +314,6 @@ ifdef BUILD_ELPA
 endif
 
 
-ifdef BUILD_MPICH
-    NW_CORE_SUBDIRS += libext
-    PATH := $(NWCHEM_TOP)/src/libext/bin:$(PATH)
-    NWMPI_INCLUDE = $(shell PATH=$(NWCHEM_TOP)/src/libext/bin:$(PATH) $(NWCHEM_TOP)/src/tools/guess-mpidefs --mpi_include)
-    NWMPI_LIB     = $(shell PATH=$(NWCHEM_TOP)/src/libext/bin:$(PATH)  $(NWCHEM_TOP)/src/tools/guess-mpidefs --mpi_lib)
-    NWLIBMPI      = $(shell PATH=$(NWCHEM_TOP)/src/libext/bin:$(PATH) $(NWCHEM_TOP)/src/tools/guess-mpidefs --libmpi)
-    NWLIBMPI	+= $(shell /usr/local/bin/pkg-config --libs-only-L hwloc 2> /dev/null)
-endif
-
 
 ifndef EXTERNAL_GA_PATH
     NW_CORE_SUBDIRS += tools
@@ -3524,6 +3515,13 @@ ifdef USE_MPI
         NWLIBMPI =
         NWMPI_INCLUDE =
         NWMPI_LIB =
+    else ifdef BUILD_MPICH
+        NW_CORE_SUBDIRS += libext
+        PATH := $(NWCHEM_TOP)/src/libext/bin:$(PATH)
+        NWMPI_INCLUDE = $(shell PATH=$(NWCHEM_TOP)/src/libext/bin:$(PATH) $(NWCHEM_TOP)/src/tools/guess-mpidefs --mpi_include)
+        NWMPI_LIB     = $(shell PATH=$(NWCHEM_TOP)/src/libext/bin:$(PATH)  $(NWCHEM_TOP)/src/tools/guess-mpidefs --mpi_lib)
+        NWLIBMPI      = $(shell PATH=$(NWCHEM_TOP)/src/libext/bin:$(PATH) $(NWCHEM_TOP)/src/tools/guess-mpidefs --libmpi)
+        NWLIBMPI	+= $(shell /usr/local/bin/pkg-config --libs-only-L hwloc 2> /dev/null)
     else ifdef FORCE_MPI_ENV
         ifndef MPI_INCLUDE
                 errormpi1: