Mercurial > mxe-octave
diff src/qt.mk @ 3014:b6c7244a2f66
Use HOST_BINDIR, HOST_LIBDIR, and HOST_INCDIR instead of MXE_BINDIR, MXE_LIBDIR, and MXE_INCDIR. Attempt to use these variables consistently instead of using $(HOST_PREFIX)/bin, $(HOST_PREFIX)/lib, and $(HOST_PREFIX)/include
| author | John W. Eaton <jwe@octave.org> |
|---|---|
| date | Sun, 02 Jun 2013 16:59:24 -0400 |
| parents | 100e618349f7 |
| children | 951da75fd09c |
line wrap: on
line diff
--- a/src/qt.mk Sun Jun 02 12:40:32 2013 -0400 +++ b/src/qt.mk Sun Jun 02 16:59:24 2013 -0400 @@ -18,12 +18,12 @@ $(PKG)_DEPS := gcc postgresql freetds openssl zlib libpng jpeg libmng tiff sqlite dbus $(PKG)_CONFIGURE_ENV := \ - CPPFLAGS='$(MXE_INCDIR)/dbus-1.0' \ - LDFLAGS='-Wl,-rpath-link,$(MXE_LIBDIR) -L$(MXE_LIBDIR)' + CPPFLAGS='$(HOST_INCDIR)/dbus-1.0' \ + LDFLAGS='-Wl,-rpath-link,$(HOST_LIBDIR) -L$(HOST_LIBDIR)' endif ifeq ($(MXE_NATIVE_BUILD),yes) - $(PKG)_CONFIGURE_INCLUDE_OPTION := -I '$(MXE_INCDIR)' + $(PKG)_CONFIGURE_INCLUDE_OPTION := -I '$(HOST_INCDIR)' $(PKG)_CONFIGURE_DATABASE_OPTION := -qt-sql-psql else ifeq ($(MXE_SYSTEM),mingw) @@ -87,10 +87,10 @@ $(MAKE) -C '$(1)' -j '$(JOBS)' $(MAKE) -C '$(1)' -j 1 install - $(LN_SF) '$(MXE_BINDIR)/moc' '$(BUILD_TOOLS_PREFIX)/bin/$(TARGET)-moc' - $(LN_SF) '$(MXE_BINDIR)/rcc' '$(BUILD_TOOLS_PREFIX)/bin/$(TARGET)-roc' - $(LN_SF) '$(MXE_BINDIR)/uic' '$(BUILD_TOOLS_PREFIX)/bin/$(TARGET)-uic' - $(LN_SF) '$(MXE_BINDIR)/qmake' '$(BUILD_TOOLS_PREFIX)/bin/$(TARGET)-qmake' + $(LN_SF) '$(HOST_BINDIR)/moc' '$(BUILD_TOOLS_PREFIX)/bin/$(TARGET)-moc' + $(LN_SF) '$(HOST_BINDIR)/rcc' '$(BUILD_TOOLS_PREFIX)/bin/$(TARGET)-roc' + $(LN_SF) '$(HOST_BINDIR)/uic' '$(BUILD_TOOLS_PREFIX)/bin/$(TARGET)-uic' + $(LN_SF) '$(HOST_BINDIR)/qmake' '$(BUILD_TOOLS_PREFIX)/bin/$(TARGET)-qmake' # cd '$(1)/tools/assistant' && '$(1)/bin/qmake' assistant.pro # $(MAKE) -C '$(1)/tools/assistant' -j '$(JOBS)' install @@ -104,10 +104,10 @@ # lrelease (from linguist) needed by octave for GUI build $(MAKE) -C '$(1)/tools/linguist/lrelease' -j '$(JOBS)' install - $(LN_SF) '$(MXE_BINDIR)/lrelease' '$(BUILD_TOOLS_PREFIX)/bin/$(TARGET)-lrelease' + $(LN_SF) '$(HOST_BINDIR)/lrelease' '$(BUILD_TOOLS_PREFIX)/bin/$(TARGET)-lrelease' # mkdir '$(1)/test-qt' # cd '$(1)/test-qt' && '$(TARGET)-qmake' '$(PWD)/$(2).pro' # $(MAKE) -C '$(1)/test-qt' -j '$(JOBS)' - # $(INSTALL) -m755 '$(1)/test-qt/release/test-qt.exe' '$(MXE_BINDIR)/' + # $(INSTALL) -m755 '$(1)/test-qt/release/test-qt.exe' '$(HOST_BINDIR)' endef