Changeset 96ace1b for configure


Ignore:
Timestamp:
2006-03-05T20:07:33Z (15 years ago)
Author:
Jelmer Vernooij <jelmer@…>
Branches:
master
Children:
728a981
Parents:
f665dab (diff), 27ac72d (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

[merge] Wilmer

File:
1 edited

Legend:

Unmodified
Added
Removed
  • configure

    rf665dab r96ace1b  
    1515config='/var/lib/bitlbee/'
    1616pidfile='/var/run/bitlbee.pid'
     17ipcsocket='/var/run/bitlbee'
    1718plugindir='$prefix/lib/bitlbee'
     19pcdir='$prefix/lib/pkgconfig'
     20includedir='$prefix/include/bitlbee'
    1821
    1922msn=1
     
    5053--pidfile=...                                           $pidfile
    5154--config=...                                            $config
     55--ipcsocket=...                                         $ipcsocket
    5256
    5357--msn=0/1       Disable/enable MSN part                 $msn
     
    7983config=`eval echo "$config/" | sed 's/\/\{1,\}/\//g'`
    8084plugindir=`eval echo "$plugindir/" | sed 's/\/\{1,\}/\//g'`
    81 pidfile=`eval echo "$pidfile/" | sed 's/\/\{1,\}/\//g'`
     85pidfile=`eval echo "$pidfile" | sed 's/\/\{1,\}/\//g'`
     86ipcsocket=`eval echo "$ipcsocket" | sed 's/\/\{1,\}/\//g'`
     87includedir=`eval echo "$includedir" | sed 's/\/\{1,\}/\//g'`
     88pcdir=`eval echo "$pcdir" | sed 's/\/\{1,\}/\//g'`
    8289
    8390cat<<EOF>Makefile.settings
     
    8996DATADIR=$datadir
    9097PLUGINDIR=$plugindir
    91 PIDFILE=$pidfile
    9298CONFIG=$config
     99IPCSOCKET=$ipcsocket
     100INCLUDEDIR=$includedir
     101PCDIR=$pcdir
    93102
    94103ARCH=$arch
     
    112121#define PLUGINDIR "$plugindir"
    113122#define PIDFILE "$pidfile"
     123#define IPCSOCKET "$ipcsocket"
    114124#define ARCH "$arch"
    115125#define CPU "$cpu"
     
    336346fi
    337347
     348cat <<EOF>bitlbee.pc
     349prefix=$prefix
     350includedir=$includedir
     351
     352Name: bitlbee
     353Description: IRC to IM gateway
     354Requires: glib-2.0
     355Version: $BITLBEE_VERSION
     356Libs:
     357Cflags: -I\${includedir}
     358
     359EOF
     360
    338361protocols=''
    339362protoobjs=''
Note: See TracChangeset for help on using the changeset viewer.