Mercurial > mxe-octave
diff src/vmime.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 | 053e00ca567e |
| children | b6c7244a2f66 |
line wrap: on
line diff
--- a/src/vmime.mk Sat Jun 01 20:52:09 2013 -0400 +++ b/src/vmime.mk Sun Jun 02 10:31:04 2013 -0400 @@ -18,8 +18,8 @@ define $(PKG)_BUILD cd '$(1)' && cmake \ -DCMAKE_TOOLCHAIN_FILE='$(CMAKE_TOOLCHAIN_FILE)' \ - -DCMAKE_AR='$(PREFIX)/bin/$(TARGET)-ar' \ - -DCMAKE_RANLIB='$(PREFIX)/bin/$(TARGET)-ranlib' \ + -DCMAKE_AR='$(BUILD_TOOLS_PREFIX)/bin/$(TARGET)-ar' \ + -DCMAKE_RANLIB='$(BUILD_TOOLS_PREFIX)/bin/$(TARGET)-ranlib' \ . # Disable VMIME_HAVE_MLANG_H @@ -28,11 +28,11 @@ $(MAKE) -C '$(1)' -j '$(JOBS)' $(MAKE) -C '$(1)' install - $(INSTALL) -m644 '$(1)/vmime/config.hpp' '$(PREFIX)/$(TARGET)/include/vmime/' + $(INSTALL) -m644 '$(1)/vmime/config.hpp' '$(HOST_PREFIX)/include/vmime/' $(SED) -i 's/posix/windows/g;' '$(1)/examples/example6.cpp' $(TARGET)-g++ -s -o '$(1)/examples/test-vmime.exe' \ '$(1)/examples/example6.cpp' \ `'$(TARGET)-pkg-config' libvmime --cflags --libs` - $(INSTALL) -m755 '$(1)/examples/test-vmime.exe' '$(PREFIX)/$(TARGET)/bin/' + $(INSTALL) -m755 '$(1)/examples/test-vmime.exe' '$(HOST_PREFIX)/bin/' endef