fix for broken --inplace, --prefix and --exec-prefix handling
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22514 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
12
wx-config.in
12
wx-config.in
@@ -18,10 +18,15 @@ static_flag="@STATIC_FLAG@"
|
|||||||
|
|
||||||
# Misc configuration variables:
|
# Misc configuration variables:
|
||||||
|
|
||||||
|
update_prefixes()
|
||||||
|
{
|
||||||
|
includedir="@includedir@"
|
||||||
|
libdir="@libdir@"
|
||||||
|
}
|
||||||
prefix="@prefix@"
|
prefix="@prefix@"
|
||||||
exec_prefix="@exec_prefix@"
|
exec_prefix="@exec_prefix@"
|
||||||
includedir="@includedir@"
|
update_prefixes
|
||||||
libdir="@libdir@"
|
|
||||||
CC="@CC@"
|
CC="@CC@"
|
||||||
GCC="@GCC@"
|
GCC="@GCC@"
|
||||||
CXX="@CXX@"
|
CXX="@CXX@"
|
||||||
@@ -227,12 +232,14 @@ while test $# -gt 0; do
|
|||||||
prefix=`makeabs $srcdir`
|
prefix=`makeabs $srcdir`
|
||||||
exec_prefix=`makeabs $builddir`
|
exec_prefix=`makeabs $builddir`
|
||||||
exec_prefix_set=yes
|
exec_prefix_set=yes
|
||||||
|
update_prefixes
|
||||||
;;
|
;;
|
||||||
--prefix=*)
|
--prefix=*)
|
||||||
prefix=$optarg
|
prefix=$optarg
|
||||||
if test $exec_prefix_set = no ; then
|
if test $exec_prefix_set = no ; then
|
||||||
exec_prefix=$optarg
|
exec_prefix=$optarg
|
||||||
fi
|
fi
|
||||||
|
update_prefixes
|
||||||
;;
|
;;
|
||||||
--prefix)
|
--prefix)
|
||||||
echo $prefix
|
echo $prefix
|
||||||
@@ -240,6 +247,7 @@ while test $# -gt 0; do
|
|||||||
--exec-prefix=*)
|
--exec-prefix=*)
|
||||||
exec_prefix=$optarg
|
exec_prefix=$optarg
|
||||||
exec_prefix_set=yes
|
exec_prefix_set=yes
|
||||||
|
update_prefixes
|
||||||
;;
|
;;
|
||||||
--exec-prefix)
|
--exec-prefix)
|
||||||
echo $exec_prefix
|
echo $exec_prefix
|
||||||
|
Reference in New Issue
Block a user