Changeset a4dc9f7 for configure


Ignore:
Timestamp:
2006-03-01T22:48:37Z (18 years ago)
Author:
Jelmer Vernooij <jelmer@…>
Branches:
master
Children:
46ad029
Parents:
8e419cb (diff), 9a1555d (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

    r8e419cb ra4dc9f7  
    1414datadir='$prefix/share/bitlbee/'
    1515config='/var/lib/bitlbee/'
     16pidfile='/var/run/bitlbee.pid'
     17ipcsocket='/var/run/bitlbee'
    1618plugindir='$prefix/lib/bitlbee'
    1719
    … …  
    4648--datadir=...                                           $datadir
    4749--plugindir=...                                         $plugindir
     50--pidfile=...                                           $pidfile
    4851--config=...                                            $config
     52--ipcsocket=...                                         $ipcsocket
    4953
    5054--msn=0/1       Disable/enable MSN part                 $msn
    … …  
    7478config=`eval echo "$config/" | sed 's/\/\{1,\}/\//g'`
    7579plugindir=`eval echo "$plugindir/" | sed 's/\/\{1,\}/\//g'`
     80pidfile=`eval echo "$pidfile" | sed 's/\/\{1,\}/\//g'`
     81ipcsocket=`eval echo "$ipcsocket" | sed 's/\/\{1,\}/\//g'`
    7682
    7783cat<<EOF>Makefile.settings
    … …  
    8490PLUGINDIR=$plugindir
    8591CONFIG=$config
     92IPCSOCKET=$ipcsocket
    8693
    8794ARCH=$arch
    … …  
    104111#define VARDIR "$datadir"
    105112#define PLUGINDIR "$plugindir"
     113#define PIDFILE "$pidfile"
     114#define IPCSOCKET "$ipcsocket"
    106115#define ARCH "$arch"
    107116#define CPU "$cpu"
Note: See TracChangeset for help on using the changeset viewer.