Changeset 1bf9492


Ignore:
Timestamp:
2008-06-09T02:18:34Z (12 years ago)
Author:
Jelmer Vernooij <jelmer@…>
Branches:
master
Children:
ddd4779
Parents:
12ebe74
Message:

Use system lib directories and pkg-config directory from target when specified.

Files:
2 edited

Legend:

Unmodified
Added
Removed
  • Makefile

    r12ebe74 r1bf9492  
    1414subdirs = lib protocols
    1515
    16 ifeq ($(ARCH),Windows)
     16ifeq ($(TARGET),i586-mingw32msvc)
    1717objects += win32.o
    1818else
  • configure

    r12ebe74 r1bf9492  
    2020ipcsocket='/var/run/bitlbee.sock'
    2121pcdir='$prefix/lib/pkgconfig'
     22systemlibdirs="/lib /usr/lib /usr/local/lib"
    2223
    2324msn=1
     
    109110PCDIR=$pcdir
    110111
     112TARGET=$target
    111113ARCH=$arch
    112114CPU=$cpu
     
    134136EOF
    135137
     138
     139
    136140if [ -n "$target" ]; then
    137         PKG_CONFIG_PATH=/usr/$target/lib/pkgconfig
     141        PKG_CONFIG_LIBDIR=/usr/$target/lib/pkgconfig
     142        export PKG_CONFIG_LIBDIR
    138143        PATH=/usr/$target/bin:$PATH
    139144        CC=$target-cc
    140145        LD=$target-ld
    141 fi
     146        systemlibdirs="/usr/$target/lib"
     147fi
     148
    142149
    143150if [ "$debug" = "1" ]; then
     
    343350echo 'SSL_CLIENT=ssl_'$ssl'.o' >> Makefile.settings
    344351
    345 for i in /lib /usr/lib /usr/local/lib; do
     352for i in $systemlibdirs; do
    346353        if [ -f $i/libresolv.a ]; then
    347354                echo '#define HAVE_RESOLV_A' >> config.h
Note: See TracChangeset for help on using the changeset viewer.