Mercurial > mxe-octave
diff src/qscintilla.mk @ 3293:cf6f40cededb
Support file list generation in packages.
For the following modules:
- arpack
- blas
- build-autoconf
- build-automake
- build-cmake
- build-gperf
- build-libtool
- build-msvctools
- build-pkg-config
- build-texinfo
- bzip2
- curl
- dbus
- expat
- fftw
- fltk
- fontconfig
- freetype
- gettext
- glpk
- gmp
- gnuplot
- gnutls
- graphicsmagick
- hdf5
- jasper
- jpeg
- lapack
- lcms
- libgcrypt
- libgpg_error
- libiconv
- libidn
- libpng
- libssh2
- libxml2
- ncurses
- nettle
- openssl
- pcre
- pstoedit
- zlib
- qhull
- qrupdate
- qscintilla
- qt
- readline
- suitesparse
- texinfo
- tiff
| author | Michael Goffioul <michael.goffioul@gmail.com> |
|---|---|
| date | Sat, 09 Nov 2013 23:28:04 -0500 |
| parents | d14352d4ab8a |
| children | cac6a7d920d2 |
line wrap: on
line diff
--- a/src/qscintilla.mk Sat Nov 09 23:28:03 2013 -0500 +++ b/src/qscintilla.mk Sat Nov 09 23:28:04 2013 -0500 @@ -28,17 +28,30 @@ cd '$(1)/Qt4Qt5' && '$(HOST_BINDIR)/qmake' -makefile $($(PKG)_QMAKE_SPEC_OPTION) if [ $(MXE_SYSTEM) = msvc ]; then \ + mkdir -p '$(3)' && \ cd '$(1)/Qt4Qt5' && \ env -u MAKE -u MAKEFLAGS nmake && \ - env -u MAKE -u MAKEFLAGS nmake install; \ + env -u MAKE -u MAKEFLAGS nmake \ + 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; \ + $(MAKE) -C '$(1)/Qt4Qt5' -j 1 install DESTDIR='$(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'; \ + rm -f '$(3)$(HOST_LIBDIR)/$(LIBRARY_PREFIX)qscintilla2$(LIBRARY_SUFFIX).dll'; \ fi - if [ $(MXE_SYSTEM) = mingw -o $(MXE_SYSTEM) = msvc ]; then \ - $(INSTALL) -m755 '$(HOST_LIBDIR)/$(LIBRARY_PREFIX)qscintilla2$(LIBRARY_SUFFIX).dll' \ - '$(HOST_BINDIR)/$(LIBRARY_PREFIX)qscintilla2$(LIBRARY_SUFFIX).dll'; \ - rm -f '$(HOST_LIBDIR)/$(LIBRARY_PREFIX)qscintilla2$(LIBRARY_SUFFIX).dll'; \ + # Qmake under MSVC uses Win32 paths. When combining this with + # DESTDIR usage (or equivalent), the real Win32 directory hierarchy + # 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'; \ + rm -f '$(3)$(CMAKE_HOST_PREFIX)/lib/$(LIBRARY_PREFIX)qscintilla2$(LIBRARY_SUFFIX).dll'; \ fi endef