Add requested changes from Harshula

src/offline/Makefile

@@ -152,18 +152,18 @@ OBJS := ${LSRC:.F90=.o}
 .SUFFIXES: .F90 .o
 #default rules for these suffixes
 .F90.o:
-	$(FC) $(CFLAGS) $(CINC) -c $<
+	$(FC) $(CFLAGS) -c $<
 
 SUPPRESS_FLAGS := -warn nostderrors -diag-disable 10145
 
 # the first target is the default target
 .PHONY: serial
 serial: cable_driver.F90 $(OBJS)
-	$(FC) $(SUPPRESS_FLAGS) $(CFLAGS) -o $(PROG_SERIAL) $^ $(CINC) $(LDFLAGS)
+	$(FC) $(SUPPRESS_FLAGS) $(CFLAGS) -o $(PROG_SERIAL) $^ $(LDFLAGS)
 
 .PHONY: mpi
 mpi: cable_mpidrv.F90 cable_mpicommon.o cable_mpimaster.o cable_mpiworker.o pop_mpi.o $(OBJS)
-	$(FC) $(SUPPRESS_FLAGS) $(CFLAGS) -o $(PROG_MPI) $^ $(CINC) $(LDFLAGS)
+	$(FC) $(SUPPRESS_FLAGS) $(CFLAGS) -o $(PROG_MPI) $^ $(LDFLAGS)
 
 cable_mpicommon.o: cable_mpicommon.F90 $(OBJS)
 pop_mpi.o: pop_mpi.F90 cable_mpicommon.o $(OBJS)

src/offline/build3.sh

@@ -19,18 +19,18 @@ host_gadi()
    # pkg-config (Note, we manually prepend to PKG_CONFIG_PATH instead of
    # using `module prepend-path` so that we can invoke this script successfully
    # in benchcab):
-   export PKG_CONFIG_PATH=${NETCDF_BASE}/lib/Intel/pkgconfig/:$PKG_CONFIG_PATH
+   export PKG_CONFIG_PATH="${NETCDF_BASE}/lib/Intel/pkgconfig/:${PKG_CONFIG_PATH}"
 
    if ! pkg-config --exists netcdf-fortran; then
-       echo ''
-       echo 'Unable to find netcdf-fortran via pkg-config. Exiting...'
-       echo ''
+       echo -e "\nUnable to find netcdf-fortran via pkg-config. Exiting...\n"
        exit 1
    fi
 
-   export CFLAGS='-O2 -fp-model precise '
-   export LDFLAGS=`pkg-config --libs netcdf-fortran`
-   export CINC=`pkg-config --cflags netcdf-fortran`
+   CFLAGS=$(pkg-config --cflags netcdf-fortran)
+   LDFLAGS=$(pkg-config --libs netcdf-fortran)
+
+   CFLAGS+="-O2 -fp-model precise "
+   export CFLAGS LDFLAGS
 
    if [[ $1 = 'mpi' ]]; then
       module add intel-mpi/2019.5.281