Mercurial > mxe-octave

comparison src/qt.mk @ 3322:41645c0a134c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 3e66ccaeff02
children 5e77c5fc91ed
comparison
equal deleted inserted replaced
3321:cac6a7d920d2 3322:41645c0a134c
159 INSTALL_ROOT=`cd $(3) && pwd -W | sed -e 's,^[a-zA-Z]:,,' -e 's,/,\\\\,g'` install && \ 159 INSTALL_ROOT=`cd $(3) && pwd -W | sed -e 's,^[a-zA-Z]:,,' -e 's,/,\\\\,g'` install && \
160 rm -f $(3)$(CMAKE_HOST_PREFIX)/lib/$(LIBRARY_PREFIX)Qt*.dll; \ 160 rm -f $(3)$(CMAKE_HOST_PREFIX)/lib/$(LIBRARY_PREFIX)Qt*.dll; \
161 else \ 161 else \
162 make -C '$(1)' -j '$(JOBS)' && \ 162 make -C '$(1)' -j '$(JOBS)' && \
163 make -C '$(1)' -j 1 install INSTALL_ROOT='$(3)'; \ 163 make -C '$(1)' -j 1 install INSTALL_ROOT='$(3)'; \
164 if [ "$(MXE_SYSTEM)" = mingw ]; then \
165 rm -f $(3)$(HOST_LIBDIR)/$(LIBRARY_PREFIX)Qt*$(LIBRARY_SUFFIX).dll; \
166 fi \
164 fi 167 fi
165 168
166 # native build doesnt seem to succeed with installing pkgconfig files to prefix 169 # native build doesn't seem to succeed when installing pkgconfig files to prefix
167 # in addition, .pc files have the wrong paths, mangled lib names 170 # in addition, .pc files have the wrong paths, mangled lib names
168 if [ "$(MXE_NATIVE_MINGW_BUILD)" = yes -a "$(MXE_SYSTEM)" != msvc ]; then \ 171 if [ "$(MXE_NATIVE_MINGW_BUILD)" = yes -a "$(MXE_SYSTEM)" != msvc ]; then \
169 find $(1)/lib/pkgconfig/*.pc -exec $(SED) -i \ 172 find $(1)/lib/pkgconfig/*.pc -exec $(SED) -i \
170 -e 's,\(.*\)_location=.*,\1_location=$${prefix}/bin/\1,g' \ 173 -e 's,\(.*\)_location=.*,\1_location=$${prefix}/bin/\1,g' \
171 -e 's,\(Libs:.* -l\).*[\\/]\([A-Za-z0-9]*\),\1\2,g' \ 174 -e 's,\(Libs:.* -l\).*[\\/]\([A-Za-z0-9]*\),\1\2,g' \