Mercurial > mxe-octave
changeset 3322:41645c0a134c
Remove *.dll files placed by Qt in lib directory, put them in bin directory instead.
* src/qt.mk: Remove *.dll files placed by Qt in lib directory, put them in bin
directory instead.
| author | Rik <rik@octave.org> |
|---|---|
| date | Thu, 14 Nov 2013 07:42:11 -0800 |
| parents | cac6a7d920d2 |
| children | 808b2c61eccb |
| files | src/qt.mk |
| diffstat | 1 files changed, 4 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/src/qt.mk Wed Nov 13 21:43:06 2013 -0800 +++ b/src/qt.mk Thu Nov 14 07:42:11 2013 -0800 @@ -161,9 +161,12 @@ else \ make -C '$(1)' -j '$(JOBS)' && \ make -C '$(1)' -j 1 install INSTALL_ROOT='$(3)'; \ + if [ "$(MXE_SYSTEM)" = mingw ]; then \ + rm -f $(3)$(HOST_LIBDIR)/$(LIBRARY_PREFIX)Qt*$(LIBRARY_SUFFIX).dll; \ + fi \ fi - # native build doesnt seem to succeed with installing pkgconfig files to prefix + # native build doesn't seem to succeed when installing pkgconfig files to prefix # in addition, .pc files have the wrong paths, mangled lib names if [ "$(MXE_NATIVE_MINGW_BUILD)" = yes -a "$(MXE_SYSTEM)" != msvc ]; then \ find $(1)/lib/pkgconfig/*.pc -exec $(SED) -i \