Mercurial > mxe-octave

changeset 3312:3e66ccaeff02

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Qt: use INSTALL_ROOT instead of DESTDIR * src/qt.mk: Use INSTALL_ROOT instead of DESTDIR for destination install. Create LIBDIR/pkgconfig directory before installing .pc files.
author John Donoghue <john.donoghue@ieee.org>
date Mon, 11 Nov 2013 13:23:58 -0500
parents 6a38c7bb94ef
children aa86d9c249d2
files src/qt.mk
diffstat 1 files changed, 5 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/src/qt.mk	Mon Nov 11 11:05:15 2013 -0500
+++ b/src/qt.mk	Mon Nov 11 13:23:58 2013 -0500
@@ -17,8 +17,8 @@
 $(PKG)_CONFIGURE_INCLUDE_OPTION :=
 $(PKG)_CONFIGURE_LIBPATH_OPTION :=
 $(PKG)_CONFIGURE_PLATFORM_OPTION :=
-$(PKG)_PREFIX := '$(HOST_PREFIX)'
-$(PKG)_MKSPECS := '$($(PKG)_PREFIX)'
+$(PKG)_PREFIX := $(HOST_PREFIX)
+$(PKG)_MKSPECS := $($(PKG)_PREFIX)
 
 ifneq ($(filter mingw msvc,$(MXE_SYSTEM)),)
   ifeq ($(MXE_NATIVE_BUILD),yes)
@@ -160,7 +160,7 @@
       rm -f $(3)$(CMAKE_HOST_PREFIX)/lib/$(LIBRARY_PREFIX)Qt*.dll; \
     else \
       make -C '$(1)' -j '$(JOBS)' && \
-      make -C '$(1)' -j 1 install DESTDIR='$(3)'; \
+      make -C '$(1)' -j 1 install INSTALL_ROOT='$(3)'; \
     fi
 
     # native build doesnt seem to succeed with installing pkgconfig files to prefix    
@@ -170,6 +170,7 @@
          -e 's,\(.*\)_location=.*,\1_location=$${prefix}/bin/\1,g' \
          -e 's,\(Libs:.* -l\).*[\\/]\([A-Za-z0-9]*\),\1\2,g' \
          '{}' ';' ; \
+       $(INSTALL) -d '$(3)$(HOST_LIBDIR)/pkgconfig'; \
        cp -f '$(1)/lib/pkgconfig/'*.pc '$(3)$(HOST_LIBDIR)/pkgconfig/';  \
     fi
 
@@ -183,7 +184,7 @@
       )
 
       # lrelease (from linguist) needed by octave for GUI build
-      $(MAKE) -C '$(1)/tools/linguist/lrelease' -j '$(JOBS)' install DESTDIR='$(3)'
+      $(MAKE) -C '$(1)/tools/linguist/lrelease' -j '$(JOBS)' install INSTALL_ROOT='$(3)'
       $(if $(filter-out yes, $(MXE_NATIVE_BUILD)),
         $(INSTALL) -m755 '$(3)$($(PKG)_PREFIX)/bin/lrelease' '$(3)$(BUILD_TOOLS_PREFIX)/bin/$(MXE_TOOL_PREFIX)lrelease'))
 endef