Mercurial > mxe-octave
view src/of-fits-1-cross-fixes.patch @ 3956:125325a2a2c4
nsis-installer: delete remaining files in reboot
* makeinst-script.mk: on errors removing files, prompt to delete files on reboot.
author | John D |
---|---|
date | Mon, 01 Jun 2015 21:25:04 -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) $<