Mercurial > mxe-octave
view src/of-fits-1-cross-fixes.patch @ 4387:05b44661c970
nsis-installer: Check new reg values for Win10 (Bug #50552)
* tools/makeinst-script.sh.in
(CheckWinVer): use CurrentMajorVersionNumber, CurrentMinorVersionNumber reg values for version number and fall back to Version, if didnt get a version number
author | John D |
---|---|
date | Thu, 18 May 2017 14:29:43 -0400 |
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) $<