Mercurial > mxe-octave
diff src/graphicsmagick.mk @ 3012:100e618349f7
Improve handling of prefix directories by defining HOST_PREFIX and
BUILD_TOOLS_PREFIX variables in top-level Makefile.
| author | John W. Eaton <jwe@octave.org> |
|---|---|
| date | Sun, 02 Jun 2013 10:31:04 -0400 |
| parents | 4f9b72cf7ee7 |
| children | bcc26ffe9a0f |
line wrap: on
line diff
--- a/src/graphicsmagick.mk Sat Jun 01 20:52:09 2013 -0400 +++ b/src/graphicsmagick.mk Sun Jun 02 10:31:04 2013 -0400 @@ -22,7 +22,7 @@ --host='$(TARGET)' \ --build="`config.guess`" \ $(ENABLE_SHARED_OR_STATIC) \ - --prefix='$(PREFIX)/$(TARGET)' \ + --prefix='$(HOST_PREFIX)' \ --without-modules \ --with-threads \ --with-magick-plus-plus \ @@ -38,13 +38,13 @@ --with-png \ --with-tiff \ --without-trio \ - --with-ttf='$(PREFIX)/$(TARGET)' \ + --with-ttf='$(HOST_PREFIX)' \ --without-wmf \ --with-xml \ --with-zlib \ --without-x \ - ac_cv_prog_xml2_config='$(PREFIX)/$(TARGET)/bin/xml2-config' \ - ac_cv_path_xml2_config='$(PREFIX)/$(TARGET)/bin/xml2-config' + ac_cv_prog_xml2_config='$(HOST_PREFIX)/bin/xml2-config' \ + ac_cv_path_xml2_config='$(HOST_PREFIX)/bin/xml2-config' $(MAKE) -C '$(1)' -j '$(JOBS)' bin_PROGRAMS= $(MAKE) -C '$(1)' -j 1 install bin_PROGRAMS= endef