Mercurial > mxe-octave
diff src/fontconfig.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 | 733c487c69c6 |
| children | bcc26ffe9a0f |
line wrap: on
line diff
--- a/src/fontconfig.mk Sat Jun 01 20:52:09 2013 -0400 +++ b/src/fontconfig.mk Sun Jun 02 10:31:04 2013 -0400 @@ -18,15 +18,15 @@ define $(PKG)_BUILD cd '$(1)' && ./configure \ $(CONFIGURE_CPPFLAGS) $(CONFIGURE_LDFLAGS) \ - FREETYPE_CFLAGS='-I$(PREFIX)/$(TARGET)/include/freetype2' \ + FREETYPE_CFLAGS='-I$(HOST_PREFIX)/include/freetype2' \ FREETYPE_LIBS='-lfreetype' \ --host='$(TARGET)' \ --build="`config.guess`" \ $(ENABLE_SHARED_OR_STATIC) \ - --prefix='$(PREFIX)/$(TARGET)' \ + --prefix='$(HOST_PREFIX)' \ --with-arch='$(TARGET)' \ --disable-docs \ - --with-expat='$(PREFIX)/$(TARGET)' + --with-expat='$(HOST_PREFIX)' $(MAKE) -C '$(1)' -j '$(JOBS)' sbin_PROGRAMS= noinst_PROGRAMS= $(MAKE) -C '$(1)' -j 1 install sbin_PROGRAMS= noinst_PROGRAMS= endef