Mercurial > mxe-octave

changeset 3321:cac6a7d920d2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Use INSTALL_ROOT instead of DESTDIR for Qscintilla install target. * src/qscintilla.mk: Use INSTALL_ROOT instead of DESTDIR for Qscintilla install target.
author Rik <rik@octave.org>
date Wed, 13 Nov 2013 21:43:06 -0800
parents f301bfef765d
children 41645c0a134c
files src/qscintilla.mk
diffstat 1 files changed, 3 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/src/qscintilla.mk	Wed Nov 13 12:35:51 2013 -0800
+++ b/src/qscintilla.mk	Wed Nov 13 21:43:06 2013 -0800
@@ -35,13 +35,12 @@
             INSTALL_ROOT=`cd $(3) && pwd -W | sed -e 's,^[a-zA-Z]:,,' -e 's,/,\\\\,g'` install; \
     else \
         $(MAKE) -C '$(1)/Qt4Qt5' -j '$(JOBS)' && \
-        $(MAKE) -C '$(1)/Qt4Qt5' -j 1 install DESTDIR='$(3)'; \
+        $(MAKE) -C '$(1)/Qt4Qt5' -j 1 install INSTALL_ROOT='$(3)'; \
     fi
 
     if [ $(MXE_SYSTEM) = mingw ]; then \
         $(INSTALL) -d '$(3)$(HOST_BINDIR)'; \
-        $(INSTALL) -m755 '$(3)$(HOST_LIBDIR)/$(LIBRARY_PREFIX)qscintilla2$(LIBRARY_SUFFIX).dll' \
-            '$(3)$(HOST_BINDIR)/$(LIBRARY_PREFIX)qscintilla2$(LIBRARY_SUFFIX).dll'; \
+        $(INSTALL) -m755 '$(3)$(HOST_LIBDIR)/$(LIBRARY_PREFIX)qscintilla2$(LIBRARY_SUFFIX).dll' '$(3)$(HOST_BINDIR)/'; \
         rm -f '$(3)$(HOST_LIBDIR)/$(LIBRARY_PREFIX)qscintilla2$(LIBRARY_SUFFIX).dll'; \
     fi
 
@@ -50,8 +49,7 @@
     # is recreated under DESTDIR, not the MSYS hierarchy.
     if [ $(MXE_SYSTEM) = msvc ]; then \
         $(INSTALL) -d '$(3)$(CMAKE_HOST_PREFIX)/bin'; \
-        $(INSTALL) -m755 '$(3)$(CMAKE_HOST_PREFIX)/lib/$(LIBRARY_PREFIX)qscintilla2$(LIBRARY_SUFFIX).dll' \
-            '$(3)$(CMAKE_HOST_PREFIX)/bin/$(LIBRARY_PREFIX)qscintilla2$(LIBRARY_SUFFIX).dll'; \
+        $(INSTALL) -m755 '$(3)$(CMAKE_HOST_PREFIX)/lib/$(LIBRARY_PREFIX)qscintilla2$(LIBRARY_SUFFIX).dll' '$(3)$(CMAKE_HOST_PREFIX)/bin/'; \
         rm -f '$(3)$(CMAKE_HOST_PREFIX)/lib/$(LIBRARY_PREFIX)qscintilla2$(LIBRARY_SUFFIX).dll'; \
     fi
 endef