Mercurial > mxe-octave
view src/of-fits-1-cross-fixes.patch @ 3900:b68c2c052a28
eliminate extra /usr directory level for cross build of epstool
author | John W. Eaton <jwe@octave.org> |
---|---|
date | Mon, 13 Apr 2015 10:11:38 -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) $<