diff options
| author | Tony Theodore <tonyt@logyst.com> | 2020-08-01 03:25:24 (GMT) |
|---|---|---|
| committer | Tony Theodore <tonyt@logyst.com> | 2020-08-01 03:25:24 (GMT) |
| commit | 6397c23af441bd7f9207a4075ae5f175aa9b2258 (patch) | |
| tree | bd82184549ef05bbda0c42a9dff8796d8a79bc62 /src | |
| parent | 73d165f4559b4d5acb1e54f15782f998e72ef5c7 (diff) | |
| download | mxe-6397c23af441bd7f9207a4075ae5f175aa9b2258.zip mxe-6397c23af441bd7f9207a4075ae5f175aa9b2258.tar.gz mxe-6397c23af441bd7f9207a4075ae5f175aa9b2258.tar.bz2 | |
graphicsmagick: use BUILD_DIR, PKG_CONFIGURE_OPTS, etc.
see #2546
Diffstat (limited to 'src')
| -rw-r--r-- | src/graphicsmagick.mk | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/src/graphicsmagick.mk b/src/graphicsmagick.mk index 5bbd1ba..657268f 100644 --- a/src/graphicsmagick.mk +++ b/src/graphicsmagick.mk @@ -19,8 +19,8 @@ endef define $(PKG)_BUILD # This can be removed once the patch "graphicsmagick-1-fix-xml2-config.patch" is accepted by upstream - cd '$(1)' && autoconf - cd '$(1)' && ./configure \ + cd '$(SOURCE_DIR)' && autoconf + cd '$(BUILD_DIR)' && '$(SOURCE_DIR)/configure' \ $(MXE_CONFIGURE_OPTS) \ --without-modules \ --with-threads \ @@ -44,9 +44,10 @@ define $(PKG)_BUILD --without-x \ ac_cv_prog_xml2_config='$(PREFIX)/$(TARGET)/bin/xml2-config' \ ac_cv_path_xml2_config='$(PREFIX)/$(TARGET)/bin/xml2-config' \ - LIBS='-lgomp -fopenmp' - $(MAKE) -C '$(1)' -j '$(JOBS)' bin_PROGRAMS= - $(MAKE) -C '$(1)' -j 1 install bin_PROGRAMS= + LIBS='-lgomp -fopenmp' \ + $(PKG_CONFIGURE_OPTS) + $(MAKE) -C '$(BUILD_DIR)' -j '$(JOBS)' bin_PROGRAMS= + $(MAKE) -C '$(BUILD_DIR)' -j 1 install bin_PROGRAMS= '$(TARGET)-g++' \ -W -Wall -Werror -pedantic -std=gnu++0x \ |