Mercurial > mxe-octave
diff src/xerces.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/xerces.mk Sat Jun 01 20:52:09 2013 -0400 +++ b/src/xerces.mk Sun Jun 02 10:31:04 2013 -0400 @@ -22,7 +22,7 @@ --host='$(TARGET)' \ $(ENABLE_SHARED_OR_STATIC) \ --disable-sse2 \ - --prefix='$(PREFIX)/$(TARGET)' \ + --prefix='$(HOST_PREFIX)' \ --enable-libtool-lock \ --disable-pretty-make \ --disable-threads \ @@ -39,7 +39,7 @@ --enable-msgloader-inmemory \ --disable-msgloader-iconv \ --disable-msgloader-icu \ - --with-curl='$(PREFIX)/$(TARGET)' \ + --with-curl='$(HOST_PREFIX)' \ --without-icu \ LIBS="`$(TARGET)-pkg-config --libs libcurl`" $(MAKE) -C '$(1)' -j '$(JOBS)' bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= @@ -47,6 +47,6 @@ '$(TARGET)-g++' \ -W -Wall -Werror -ansi -pedantic \ - '$(2).cpp' -o '$(PREFIX)/$(TARGET)/bin/test-xerces.exe' \ + '$(2).cpp' -o '$(HOST_PREFIX)/bin/test-xerces.exe' \ `'$(TARGET)-pkg-config' xerces-c --cflags --libs` endef