fixed wxINSTALL_PREFIX setting
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11337 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
parent
7e67ed0df4
commit
06dda230f6
10
configure
vendored
10
configure
vendored
@ -17948,8 +17948,14 @@ EOF
|
||||
|
||||
|
||||
|
||||
if test "x$prefix" != "xNONE"; then
|
||||
wxPREFIX=$prefix
|
||||
else
|
||||
wxPREFIX=$ac_default_prefix
|
||||
fi
|
||||
|
||||
cat >> confdefs.h <<EOF
|
||||
#define wxINSTALL_PREFIX $prefix
|
||||
#define wxINSTALL_PREFIX "$wxPREFIX"
|
||||
EOF
|
||||
|
||||
|
||||
@ -18099,7 +18105,7 @@ SAMPLES_SUBDIRS="`echo $SAMPLES_SUBDIRS | tr -s ' ' | tr ' ' '\n' | sort | uniq
|
||||
|
||||
|
||||
echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6
|
||||
echo "configure:18103: checking whether ${MAKE-make} sets \${MAKE}" >&5
|
||||
echo "configure:18109: checking whether ${MAKE-make} sets \${MAKE}" >&5
|
||||
set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'`
|
||||
if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
|
@ -4510,7 +4510,13 @@ dnl ---------------------------------------------------------------------------
|
||||
dnl define the variable containing the installation prefix (used in dcpsg.cpp)
|
||||
dnl ---------------------------------------------------------------------------
|
||||
|
||||
AC_DEFINE_UNQUOTED(wxINSTALL_PREFIX, $prefix)
|
||||
if test "x$prefix" != "xNONE"; then
|
||||
wxPREFIX=$prefix
|
||||
else
|
||||
wxPREFIX=$ac_default_prefix
|
||||
fi
|
||||
|
||||
AC_DEFINE_UNQUOTED(wxINSTALL_PREFIX, "$wxPREFIX")
|
||||
|
||||
dnl ---------------------------------------------------------------------------
|
||||
dnl Output the makefiles and such from the results found above
|
||||
|
Loading…
Reference in New Issue
Block a user