comparison Makefile.in @ 5009:fd5e5727326c

Makefile.in: If using lib64 dir, set pkg config path to use both lib and lib64 dirs
author John W. Eaton <jwe@octave.org>
date Mon, 11 Mar 2019 14:05:20 +0000
parents 2bffe6abd696
children 9fc252d2d72b
comparison
equal deleted inserted replaced
5008:f5b246c2bf4e 5009:fd5e5727326c
319 BUILD_PKG_CONFIG_PATH ?= @BUILD_PKG_CONFIG_PATH@ 319 BUILD_PKG_CONFIG_PATH ?= @BUILD_PKG_CONFIG_PATH@
320 320
321 CONFIGURE_CPPFLAGS := CPPFLAGS='-I$(HOST_PREFIX)/include' 321 CONFIGURE_CPPFLAGS := CPPFLAGS='-I$(HOST_PREFIX)/include'
322 ifeq ($(MXE_USE_LIB64_DIRECTORY),yes) 322 ifeq ($(MXE_USE_LIB64_DIRECTORY),yes)
323 CONFIGURE_LDFLAGS := LDFLAGS='-L$(HOST_PREFIX)/lib -L$(HOST_PREFIX)/lib64' 323 CONFIGURE_LDFLAGS := LDFLAGS='-L$(HOST_PREFIX)/lib -L$(HOST_PREFIX)/lib64'
324 PKG_CONFIG_PATH := $(HOST_PREFIX)/lib64/pkgconfig 324 PKG_CONFIG_PATH := $(HOST_PREFIX)/lib/pkgconfig:$(HOST_PREFIX)/lib64/pkgconfig
325 export PKG_CONFIG_PATH 325 export PKG_CONFIG_PATH
326 else 326 else
327 CONFIGURE_LDFLAGS := LDFLAGS='-L$(HOST_PREFIX)/lib' 327 CONFIGURE_LDFLAGS := LDFLAGS='-L$(HOST_PREFIX)/lib'
328 PKG_CONFIG_PATH := $(HOST_PREFIX)/lib/pkgconfig 328 PKG_CONFIG_PATH := $(HOST_PREFIX)/lib/pkgconfig
329 export PKG_CONFIG_PATH 329 export PKG_CONFIG_PATH