From 78f9235232ab9b4dd3393a646497010beb6f449c Mon Sep 17 00:00:00 2001 From: Luke Date: Mon, 9 Oct 2017 20:30:59 +0200 Subject: Style updates --- src/freexl.mk | 6 +++--- src/gta.mk | 1 - src/spatialite.mk | 2 +- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/src/freexl.mk b/src/freexl.mk index 736aa10..399c9da 100644 --- a/src/freexl.mk +++ b/src/freexl.mk @@ -18,10 +18,10 @@ define $(PKG)_UPDATE endef define $(PKG)_BUILD - cd '$(SOURCE_DIR)' && ./configure \ + cd '$(BUILD_DIR)' && '$(SOURCE_DIR)/configure' \ $(MXE_CONFIGURE_OPTS) - $(MAKE) -C '$(SOURCE_DIR)' -j '$(JOBS)' $(MXE_DISABLE_PROGRAMS) - $(MAKE) -C '$(SOURCE_DIR)' -j 1 $(INSTALL_STRIP_LIB) + $(MAKE) -C '$(BUILD_DIR)' -j '$(JOBS)' $(MXE_DISABLE_PROGRAMS) + $(MAKE) -C '$(BUILD_DIR)' -j 1 $(INSTALL_STRIP_LIB) # the test program comes from the freexl sources itself (test_xl.c) '$(TARGET)-gcc' \ diff --git a/src/gta.mk b/src/gta.mk index bd6cba0..afcd353 100644 --- a/src/gta.mk +++ b/src/gta.mk @@ -30,4 +30,3 @@ define $(PKG)_BUILD '$(TEST_FILE)' -o '$(PREFIX)/$(TARGET)/bin/test-gta.exe' \ `'$(TARGET)-pkg-config' gta --cflags --libs` endef - diff --git a/src/spatialite.mk b/src/spatialite.mk index f381b9b..185dd75 100644 --- a/src/spatialite.mk +++ b/src/spatialite.mk @@ -9,7 +9,7 @@ $(PKG)_CHECKSUM := 80f7fff0a147044c5eb197e565f598ac1f137d86d0a548cbc8f52fb7ff7ca $(PKG)_SUBDIR := libspatialite-$($(PKG)_VERSION) $(PKG)_FILE := libspatialite-$($(PKG)_VERSION).tar.gz $(PKG)_URL := http://www.gaia-gis.it/gaia-sins/libspatialite-sources/$($(PKG)_FILE) -$(PKG)_DEPS := dlfcn-win32 freexl geos sqlite zlib proj libiconv libxml2 +$(PKG)_DEPS := gcc dlfcn-win32 freexl geos sqlite zlib proj libiconv libxml2 define $(PKG)_UPDATE $(WGET) -q -O- 'http://www.gaia-gis.it/gaia-sins/libspatialite-sources/' | \ -- cgit v0.12