Skip to content

Commit 3415a99

Browse files
committed
guard against lack of split_ncvars man page in conda package, at autoconf and automake, adjust make check call
1 parent 5c8c20b commit 3415a99

File tree

3 files changed

+7
-4
lines changed

3 files changed

+7
-4
lines changed

build.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
autoreconf -i
22
./configure --prefix=$PREFIX --disable-ocean-model-grid-generator
3-
make -j 2
3+
make -j
44
make install

meta.yaml

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package:
22
name: fre-nctools
3-
version: conda.alpha
3+
version: alpha
44

55
source:
66
path: .
@@ -10,17 +10,20 @@ build:
1010

1111
requirements:
1212
build:
13+
- conda-forge::autoconf
14+
- conda-forge::automake
1315
- conda-forge::libnetcdf
1416
- conda-forge::netcdf-fortran
1517
- conda-forge::nco
1618
- conda-forge::hdf5=1.14.*=mpi*
1719
- conda-forge::openmp
20+
- conda-forge::mpich
1821
- conda-forge::tcsh
1922
run:
2023

2124
test:
2225
commands:
23-
- make check-expensive
26+
- make check RUN_EXPENSIVE_TESTS=yes
2427

2528
about:
2629
license: LGPL-3.0

src/Makefile.am

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -213,4 +213,4 @@ split_ncvars.pl: split_ncvars/split_ncvars.pl.in Makefile
213213
install-exec-hook:
214214
ln $(DESTDIR)$(bindir)/split_ncvars.pl $(DESTDIR)$(bindir)/split_ncvars
215215
install-data-hook:
216-
ln $(DESTDIR)$(mandir)/man1/split_ncvars.pl.1 $(DESTDIR)$(mandir)/man1/split_ncvars.1
216+
ln $(DESTDIR)$(mandir)/man1/split_ncvars.pl.1 $(DESTDIR)$(mandir)/man1/split_ncvars.1 || echo OOPS

0 commit comments

Comments
 (0)