Mercurial > mxe-octave
diff src/poppler.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 | 47558e958113 |
| children | bcc26ffe9a0f |
line wrap: on
line diff
--- a/src/poppler.mk Sat Jun 01 20:52:09 2013 -0400 +++ b/src/poppler.mk Sun Jun 02 10:31:04 2013 -0400 @@ -23,7 +23,7 @@ cd '$(1)' && ./configure \ --host='$(TARGET)' \ --build="`config.guess`" \ - --prefix='$(PREFIX)/$(TARGET)' \ + --prefix='$(HOST_PREFIX)' \ --disable-silent-rules \ $(ENABLE_SHARED_OR_STATIC) \ --enable-xpdf-headers \ @@ -46,14 +46,14 @@ --disable-gtk-doc-html \ --disable-gtk-doc-pdf \ --with-font-configuration=win32 \ - PKG_CONFIG_PATH_$(subst -,_,$(TARGET))='$(PREFIX)/$(TARGET)/qt/lib/pkgconfig' \ + PKG_CONFIG_PATH_$(subst -,_,$(TARGET))='$(HOST_PREFIX)/qt/lib/pkgconfig' \ LIBS="`'$(TARGET)-pkg-config' zlib liblzma --libs` -ljpeg" $(MAKE) -C '$(1)' -j '$(JOBS)' install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= # Test program '$(TARGET)-g++' \ -W -Wall -Werror -ansi -pedantic \ - '$(2).cxx' -o '$(PREFIX)/$(TARGET)/bin/test-poppler.exe' \ + '$(2).cxx' -o '$(HOST_PREFIX)/bin/test-poppler.exe' \ `'$(TARGET)-pkg-config' poppler poppler-cpp --cflags --libs` endef