Mercurial > mxe-octave

view src/of-fits-1-cross-fixes.patch @ 4066:0962acdde3be

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
builld: allow out of source build * Makefile.in: add TOP_BUILD_DIR var and use TOP_DIR=srcdir, TOP_BUILD_DIR=builddir, modify paths to use TOP_DIR where needed * binary-dist-rules.mk: use TOP_DIR and TOP_BUILD_DIR where needed * makeinst-script.sh: use script path to determine TOPDIR, use TOPDIR where needed * src/default-octave.mk: install octave-version to builddir * src/stable-octave.mk: install octave-version to builddir * src/octave.mk: install octave-version to builddir * tools/set-mxe-env.sh.in: update fir builddir and srcdir use
author John Donoghue
date Wed, 23 Dec 2015 08:11:04 -0500
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) $<