Mercurial > mxe-octave

view src/of-fits-1-cross-fixes.patch @ 3872:d7b2bb282421

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
mingw-w64: patch mingw-w64 for %g bug * dist-files.mk: add mingw-w64-3-fix-g-format.patch * src/mingw-w64-3-fix-g-format.patch: new file * src/build-gcc.mk: apply patches to mingw-w64 before building crt
author John Donoghue
date Mon, 06 Apr 2015 11:30:00 -0400
parents 85568f3159a4
children 414c464563c6
line wrap: on
line source

diff -ur fits.orig/src/Makefile fits/src/Makefile
--- fits.orig/src/Makefile	2015-03-20 13:37:26.766478760 -0400
+++ fits/src/Makefile	2015-03-20 13:39:14.198586323 -0400
@@ -1,4 +1,6 @@
-MKOCT_FLAGS = $(shell pkg-config --libs cfitsio)
+MKOCTFILE ?= mkoctfile
+PKG_CONFIG ?= pkg-config
+MKOCT_FLAGS = $(shell $(PKG_CONFIG) --libs 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) $<