Mercurial > mxe-octave

comparison Makefile.in @ 3863:3909c600a7db

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Makefile.in: set HOST_BINDIR, HOST_LIBDIR, etc. before using them.
author John W. Eaton <jwe@octave.org>
date Tue, 24 Mar 2015 16:54:07 -0400
parents 9ceedf18871e
children 768c5d4c5b4e
comparison
equal deleted inserted replaced
3862:c08abc3f5bf3 3863:3909c600a7db
251 export PKG_CONFIG_PATH 251 export PKG_CONFIG_PATH
252 else 252 else
253 CONFIGURE_LDFLAGS := LDFLAGS='-L$(HOST_PREFIX)/lib' 253 CONFIGURE_LDFLAGS := LDFLAGS='-L$(HOST_PREFIX)/lib'
254 endif 254 endif
255 CONFIGURE_POST_HOOK := true 255 CONFIGURE_POST_HOOK := true
256
257 HOST_BINDIR := $(HOST_PREFIX)/bin
258 HOST_LIBDIR := $(HOST_PREFIX)/lib
259 HOST_LIB64DIR := $(HOST_PREFIX)/lib64
260 HOST_INCDIR := $(HOST_PREFIX)/include
256 261
257 ifeq ($(MXE_NATIVE_BUILD),yes) 262 ifeq ($(MXE_NATIVE_BUILD),yes)
258 MXE_TOOL_PREFIX := 263 MXE_TOOL_PREFIX :=
259 ifeq ($(MXE_NATIVE_MINGW_BUILD),yes) 264 ifeq ($(MXE_NATIVE_MINGW_BUILD),yes)
260 # The installation directories have been created previously. So we 265 # The installation directories have been created previously. So we
344 endif 349 endif
345 350
346 ifeq ($(MXE_SYSTEM),mingw) 351 ifeq ($(MXE_SYSTEM),mingw)
347 MAKE_SHARED_FROM_STATIC_OPTIONS := --windowsdll 352 MAKE_SHARED_FROM_STATIC_OPTIONS := --windowsdll
348 endif 353 endif
349
350 HOST_BINDIR := $(HOST_PREFIX)/bin
351 HOST_LIBDIR := $(HOST_PREFIX)/lib
352 HOST_LIB64DIR := $(HOST_PREFIX)/lib64
353 HOST_INCDIR := $(HOST_PREFIX)/include
354 354
355 ifeq ($(MXE_SYSTEM),mingw) 355 ifeq ($(MXE_SYSTEM),mingw)
356 MXE_WINDOWS_BUILD := yes 356 MXE_WINDOWS_BUILD := yes
357 ifneq ($(MXE_NATIVE_BUILD),yes) 357 ifneq ($(MXE_NATIVE_BUILD),yes)
358 MSYS_URL := http://sourceforge.net/projects/mingw/files/MSYS 358 MSYS_URL := http://sourceforge.net/projects/mingw/files/MSYS