Mercurial > mxe-octave

view src/of-fits-1-cross-fixes.patch @ 5430:98bcc037fad7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
* src/hdf5.mk: Update version to 1.12.0. Use cmake for Windows cross targets. * src/hdf5-1-fixes.patch: Remove patch. * src/mingw-hdf5-1.patch: Update patch. * dist-files.mk: Remove file from list. * src/of-communictaions.mk: Use pkg-config for linking in hdf5.
author Markus Mützel <markus.muetzel@gmx.de>
date Mon, 25 May 2020 18:14:52 +0200
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) $<