prosody
5a82ee60e07e
configure

Find changesets by keywords by author, files, the commit message, revision number or hash, or revset expression.

Software / code / prosody

Comparison

configure @ 6579:5a82ee60e07e

configure: Fix for commit cd0088c73daf - update LIBDIR if --prefix is set and --libdir isn't (thanks Medics)
author Matthew Wild <mwild1@gmail.com>
date Tue, 24 Feb 2015 15:19:20 +0000
parent 6574:cd0088c73daf
child 6580:74946f050209
comparison
equal deleted inserted replaced
6578:6f55db7afd3b 6579:5a82ee60e07e
137 then LUA_INCDIR="/usr/local/include"; 137 then LUA_INCDIR="/usr/local/include";
138 fi 138 fi
139 ;; 139 ;;
140 --libdir=*) 140 --libdir=*)
141 LIBDIR="$value" 141 LIBDIR="$value"
142 LIBDIR_SET=yes
142 ;; 143 ;;
143 --datadir=*) 144 --datadir=*)
144 DATADIR="$value" 145 DATADIR="$value"
145 DATADIR_SET=yes 146 DATADIR_SET=yes
146 ;; 147 ;;
209 then 210 then
210 if [ "$PREFIX" = "/usr" ] 211 if [ "$PREFIX" = "/usr" ]
211 then DATADIR=/var/lib/prosody 212 then DATADIR=/var/lib/prosody
212 else DATADIR=$PREFIX/var/lib/prosody 213 else DATADIR=$PREFIX/var/lib/prosody
213 fi 214 fi
215 fi
216
217 if [ "$PREFIX_SET" = "yes" -a ! "$LIBDIR_SET" = "yes" ]
218 then
219 LIBDIR=$PREFIX/lib
214 fi 220 fi
215 221
216 find_program() { 222 find_program() {
217 path="$PATH" 223 path="$PATH"
218 item="`echo "$path" | sed 's/\([^:]*\):.*/\1/'`" 224 item="`echo "$path" | sed 's/\([^:]*\):.*/\1/'`"