Minor build file cleanup.

Makefile

@@ -30,7 +30,7 @@ CUDECOMPLIB=${BUILDDIR}/lib/libcudecomp.so
 CUDECOMPFLIB=${BUILDDIR}/lib/libcudecomp_fort.so
 CUDECOMPMOD=${BUILDDIR}/cudecomp_m.o
 
-INCLUDES = -I${PWD}/include -I${MPI_HOME}/include -I${CUDA_HOME}/include -I${NCCL_HOME}/include  -I${CUTENSOR_HOME}/include -I${CUDACXX_HOME}/include -I${NVSHMEM_HOME}/include
+INCLUDES = -I${PWD}/include -I${MPI_HOME}/include -I${CUDA_HOME}/include -I${NCCL_HOME}/include  -I${CUTENSOR_HOME}/include -I${CUDACXX_HOME}/include
 LIBS = -L${CUDA_HOME}/lib64 -L${CUTENSOR_HOME}/lib64 -L${NCCL_HOME}/lib -L${CUDA_HOME}/lib64/stubs -lnccl -lcutensor -lcudart
 FLIBS = -cudalib=nccl,cutensor -lstdc++ -L${CUDA_HOME}/lib64 -L${CUDA_HOME}/lib64/stubs
 

configs/nvhpcsdk.conf

@@ -8,7 +8,7 @@ MPI_HOME=${NVHPC_HOME}/comm_libs/hpcx/latest/ompi
 NCCL_HOME=${NVHPC_HOME}/comm_libs/nccl
 CUFFT_HOME=${NVHPC_HOME}/math_libs
 CUTENSOR_HOME=${NVHPC_HOME}/math_libs
-CUDACXX_HOME=${CUDA_HOME}/include
+CUDACXX_HOME=${CUDA_HOME}
 
 # Optional variables
 CUDA_CC_LIST=60 70 80

configs/nvhpcsdk_pm.conf

@@ -13,11 +13,11 @@ MPI_HOME=${CRAY_MPICH_PREFIX}
 NCCL_HOME=${NVHPC_HOME}/comm_libs/nccl
 CUFFT_HOME=${NVHPC_HOME}/math_libs
 CUTENSOR_HOME=${NVHPC_HOME}/math_libs
-CUDACXX_HOME=${CUDA_HOME}/include
+CUDACXX_HOME=${CUDA_HOME}
 
 # Optional variables
 CUDA_CC_LIST=80
 BUILD_FORTRAN=1
 ENABLE_NVTX=1
 ENABLE_NVSHMEM=0
-NVSHMEM_HOME=${HOME}/libraries/nvshmem
+NVSHMEM_HOME=