Mercurial > mxe-octave
view src/of-fits-1-cross-fixes.patch @ 4128:253ac032547a
Fix more problems with libmng recipe (bug #47712).
* src/libmng.mk: Remove unnecessary mkdir command in recipe. Call autoreconf
with --force option because the libmng archive file ships with an out-of-date
ltmain.sh which will not be replaced without --force.
| author | Rik <rik@octave.org> |
|---|---|
| date | Wed, 20 Apr 2016 15:39:48 -0700 |
| parents | 414c464563c6 |
| children | 97ad836259c3 |
line wrap: on
line source
diff -ur fits-1.0.7.orig/src/Makefile fits-1.0.7/src/Makefile --- fits-1.0.7.orig/src/Makefile 2016-02-25 13:08:47.394452025 -0500 +++ fits-1.0.7/src/Makefile 2016-02-25 13:10:40.437730825 -0500 @@ -1,4 +1,6 @@ -MKOCT_FLAGS = $(shell pkg-config --libs cfitsio --cflags cfitsio) +MKOCTFILE ?= mkoctfile +PKG_CONFIG ?= pkg-config +MKOCT_FLAGS = $(shell $(PKG_CONFIG) --libs cfitsio --cflags cfitsio) all: read_fits_image.oct save_fits_image.oct save_fits_image_multi_ext.oct @@ -6,5 +8,5 @@ rm -f *.oct *.o %.oct: %.cc - mkoctfile --verbose -Wall $(MKOCT_FLAGS) $< + $(MKOCTFILE) --verbose -Wall $(MKOCT_FLAGS) $<