Mercurial > mxe-octave
comparison Makefile.in @ 3230:bd4487905031
Update makefile.in for pkg-config name in cross compile
* ./makefile.in: change from compile pkg-config name from $(MXE_TOOL_PREFIX)pkg-config to pkg-config (which is what gets installed)
author | John Donoghue <john.donoghue@ieee.org> |
---|---|
date | Sat, 10 Aug 2013 17:51:12 -0400 |
parents | c0f577fc5d4a |
children | 4c8eca3ca2ba 7fb479d0241c |
comparison
equal
deleted
inserted
replaced
3229:1cbee4743e97 | 3230:bd4487905031 |
---|---|
233 ifeq ($(MXE_SYSTEM),mingw) | 233 ifeq ($(MXE_SYSTEM),mingw) |
234 MXE_WINDRES := '$(BUILD_TOOLS_PREFIX)/bin/$(MXE_TOOL_PREFIX)windres' | 234 MXE_WINDRES := '$(BUILD_TOOLS_PREFIX)/bin/$(MXE_TOOL_PREFIX)windres' |
235 else | 235 else |
236 MXE_WINDRES := true | 236 MXE_WINDRES := true |
237 endif | 237 endif |
238 MXE_PKG_CONFIG := '$(BUILD_TOOLS_PREFIX)/bin/$(MXE_TOOL_PREFIX)pkg-config' | 238 MXE_PKG_CONFIG := '$(BUILD_TOOLS_PREFIX)/bin/pkg-config' |
239 MXE_QMAKE := '$(BUILD_TOOLS_PREFIX)/bin/$(MXE_TOOL_PREFIX)qmake' | 239 MXE_QMAKE := '$(BUILD_TOOLS_PREFIX)/bin/$(MXE_TOOL_PREFIX)qmake' |
240 endif | 240 endif |
241 | 241 |
242 ifeq ($(MXE_SYSTEM),mingw) | 242 ifeq ($(MXE_SYSTEM),mingw) |
243 MAKE_SHARED_FROM_STATIC_OPTIONS := --windowsdll | 243 MAKE_SHARED_FROM_STATIC_OPTIONS := --windowsdll |