Mercurial > mxe-octave

comparison src/qscintilla.mk @ 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 cf6f40cededb
children 13be64f9f16d
comparison
equal deleted inserted replaced
3320:f301bfef765d 3321:cac6a7d920d2
33 env -u MAKE -u MAKEFLAGS nmake && \ 33 env -u MAKE -u MAKEFLAGS nmake && \
34 env -u MAKE -u MAKEFLAGS nmake \ 34 env -u MAKE -u MAKEFLAGS nmake \
35 INSTALL_ROOT=`cd $(3) && pwd -W | sed -e 's,^[a-zA-Z]:,,' -e 's,/,\\\\,g'` install; \ 35 INSTALL_ROOT=`cd $(3) && pwd -W | sed -e 's,^[a-zA-Z]:,,' -e 's,/,\\\\,g'` install; \
36 else \ 36 else \
37 $(MAKE) -C '$(1)/Qt4Qt5' -j '$(JOBS)' && \ 37 $(MAKE) -C '$(1)/Qt4Qt5' -j '$(JOBS)' && \
38 $(MAKE) -C '$(1)/Qt4Qt5' -j 1 install DESTDIR='$(3)'; \ 38 $(MAKE) -C '$(1)/Qt4Qt5' -j 1 install INSTALL_ROOT='$(3)'; \
39 fi 39 fi
40 40
41 if [ $(MXE_SYSTEM) = mingw ]; then \ 41 if [ $(MXE_SYSTEM) = mingw ]; then \
42 $(INSTALL) -d '$(3)$(HOST_BINDIR)'; \ 42 $(INSTALL) -d '$(3)$(HOST_BINDIR)'; \
43 $(INSTALL) -m755 '$(3)$(HOST_LIBDIR)/$(LIBRARY_PREFIX)qscintilla2$(LIBRARY_SUFFIX).dll' \ 43 $(INSTALL) -m755 '$(3)$(HOST_LIBDIR)/$(LIBRARY_PREFIX)qscintilla2$(LIBRARY_SUFFIX).dll' '$(3)$(HOST_BINDIR)/'; \
44 '$(3)$(HOST_BINDIR)/$(LIBRARY_PREFIX)qscintilla2$(LIBRARY_SUFFIX).dll'; \
45 rm -f '$(3)$(HOST_LIBDIR)/$(LIBRARY_PREFIX)qscintilla2$(LIBRARY_SUFFIX).dll'; \ 44 rm -f '$(3)$(HOST_LIBDIR)/$(LIBRARY_PREFIX)qscintilla2$(LIBRARY_SUFFIX).dll'; \
46 fi 45 fi
47 46
48 # Qmake under MSVC uses Win32 paths. When combining this with 47 # Qmake under MSVC uses Win32 paths. When combining this with
49 # DESTDIR usage (or equivalent), the real Win32 directory hierarchy 48 # DESTDIR usage (or equivalent), the real Win32 directory hierarchy
50 # is recreated under DESTDIR, not the MSYS hierarchy. 49 # is recreated under DESTDIR, not the MSYS hierarchy.
51 if [ $(MXE_SYSTEM) = msvc ]; then \ 50 if [ $(MXE_SYSTEM) = msvc ]; then \
52 $(INSTALL) -d '$(3)$(CMAKE_HOST_PREFIX)/bin'; \ 51 $(INSTALL) -d '$(3)$(CMAKE_HOST_PREFIX)/bin'; \
53 $(INSTALL) -m755 '$(3)$(CMAKE_HOST_PREFIX)/lib/$(LIBRARY_PREFIX)qscintilla2$(LIBRARY_SUFFIX).dll' \ 52 $(INSTALL) -m755 '$(3)$(CMAKE_HOST_PREFIX)/lib/$(LIBRARY_PREFIX)qscintilla2$(LIBRARY_SUFFIX).dll' '$(3)$(CMAKE_HOST_PREFIX)/bin/'; \
54 '$(3)$(CMAKE_HOST_PREFIX)/bin/$(LIBRARY_PREFIX)qscintilla2$(LIBRARY_SUFFIX).dll'; \
55 rm -f '$(3)$(CMAKE_HOST_PREFIX)/lib/$(LIBRARY_PREFIX)qscintilla2$(LIBRARY_SUFFIX).dll'; \ 53 rm -f '$(3)$(CMAKE_HOST_PREFIX)/lib/$(LIBRARY_PREFIX)qscintilla2$(LIBRARY_SUFFIX).dll'; \
56 fi 54 fi
57 endef 55 endef