Skip to content

Commit 3dab782

Browse files
committed
Check for libpnetcdf library existence rather than just directory
This follows the same logic as before with the added check that a libpnetcdf.* file exists in the checked directory. The change in logic will now account for situations where PNETCDF is set to a directory containing both lib/ and lib64/ directories and libpnetcdf.* exists in just the lib/ folder. Should libpnetcdf.* exist in both directories, the lib64/ still maintains precedence.
1 parent 82681e9 commit 3dab782

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -761,10 +761,10 @@ endif
761761

762762

763763
ifneq "$(PNETCDF)" ""
764-
ifneq ($(wildcard $(PNETCDF)/lib), )
764+
ifneq ($(wildcard $(PNETCDF)/lib/libpnetcdf.*), )
765765
PNETCDFLIBLOC = lib
766766
endif
767-
ifneq ($(wildcard $(PNETCDF)/lib64), )
767+
ifneq ($(wildcard $(PNETCDF)/lib64/libpnetcdf.*), )
768768
PNETCDFLIBLOC = lib64
769769
endif
770770
CPPINCLUDES += -I$(PNETCDF)/include

0 commit comments

Comments
 (0)