Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Install the config files for cross debs under /usr/$(host), but link them

Browse Source 
to the default system location under /usr.  This way the commands:
wx-config --prefix=/usr/$(host) and wx-config --prefix=/usr --host=$(host)
are much more congruent in their action.

Another nail in the coffin for inplace hacks.  Link $srcdir/include to
the build dir so that --prefix=$build_dir really does point to a
realistic looking installed development environment.  I don't know why
I didn't do this instead of (ab)using --exec-prefix to 'fix' this
simple omission for so long.  Probably because it is much more obvious
if contrib is out of the picture.  That makes it a little more work
right now, but long term this is a very clean and correct thing to do.
It completely absolves us of the two independent variables problem,
and of the tree becoming bogus without actually being stale.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29260 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Ron Lee
2004-09-22 20:29:51 +00:00
parent 589e20d03c
commit 9103d280f9
5 changed files with 212 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
wx-config.in
View File

@@ -311,7 +311,7 @@ get_mask()
# Determine the base directories we require.
prefix=${input_option_prefix-${this_prefix:-@prefix@}}
exec_prefix=${input_option_exec_prefix-${input_option_prefix-${this_exec_prefix:-@exec_prefix@}}}
exec_prefix=${input_option_exec_prefix-${input_option_prefix-@exec_prefix@}}
wxconfdir="@libdir@/wx/config"
installed_configs=$( cd "$wxconfdir" 2> /dev/null && ls | grep -v "^inplace-" )
@@ -703,14 +703,12 @@ fi
[ -z "$WXDEBUG" ] || decho " using this config"
if [ -n "$flag_option_inplace" ]; then
# If the user supplied a prefix, then the in tree config did not
# delegate out to anything in the user supplied prefix so reset
# the prefixes back to provide the correct compile options for
# this uninstalled wx build.
prefix=$this_prefix
exec_prefix=$this_exec_prefix
fi
# If the user supplied a prefix, and the in tree config did not
# delegate out to anything in that prefix, then reset the build
# tree prefix to provide the correct output for using this
# uninstalled wx build. Or put more simply:
prefix=${this_prefix-$prefix}
exec_prefix=${this_prefix-$exec_prefix}
includedir="@includedir@"
libdir="@libdir@"
@@ -883,36 +881,15 @@ fi
# Endgame. Nothing left to discover now.
# --------------------------------------------------------------
# cppflags
# This function exists for no other reason than to make conditional
# something that we may not use on several occasions. It outputs
# the basic cppflags determined from information gleaned above.
# Nothing below here will change what it outputs, only whether it
# does or not.
cppflags()
{
_cppflags="-I${libdir}/wx/include/@TOOLCHAIN_FULLNAME@"
if [ -n "$flag_option_inplace" ]; then
# Bring in all the headers as if the whole tree had been installed.
_cppflags="$_cppflags -I$includedir -I${prefix}/contrib/include"
else
_cppflags="$_cppflags -I${includedir}/wx-@WX_RELEASE@@WX_FLAVOUR@"
fi
_cppflags="$_cppflags @WXDEBUG_DEFINE@ @TOOLCHAIN_DEFS@"
[ -n "$this_linkage" ] || _cppflags="$_cppflags @TOOLCHAIN_DLL_DEFS@"
[ "$using_gui" = "yes" ] || _cppflags="$_cppflags -DwxUSE_GUI=0"
echo $_cppflags "@WXCONFIG_INCLUDE@" "@WX_LARGEFILE_FLAGS@" "@GCC_PRAGMA_FLAGS@"
}
[ -n "$this_linkage" ] || _static_cppflags="@TOOLCHAIN_DLL_DEFS@"
[ "$using_gui" = "yes" ] || _gui_cppflags="-DwxUSE_GUI=0"
_cppflags=$(echo "-I${libdir}/wx/include/@TOOLCHAIN_FULLNAME@ -I${includedir}/wx-@WX_RELEASE@@WX_FLAVOUR@" "@WXDEBUG_DEFINE@" "@TOOLCHAIN_DEFS@" $_static_cppflags $_gui_cppflags "@WXCONFIG_INCLUDE@" "@WX_LARGEFILE_FLAGS@" "@GCC_PRAGMA_FLAGS@")
# now without further ado, we can answer these too.
[ -z "$output_option_cppflags" ] || echo $(cppflags)
[ -z "$output_option_cflags" ] || echo $(cppflags) "@CODE_GEN_FLAGS@"
[ -z "$output_option_cxxflags" ] || echo $(cppflags) "@CODE_GEN_FLAGS@" "@CODE_GEN_FLAGS_CXX@"
[ -z "$output_option_cppflags" ] || echo $_cppflags
[ -z "$output_option_cflags" ] || echo $_cppflags "@CODE_GEN_FLAGS@"
[ -z "$output_option_cxxflags" ] || echo $_cppflags "@CODE_GEN_FLAGS@" "@CODE_GEN_FLAGS_CXX@"
[ -z "$output_option_gl_libs" ] || echo $(lib_flags_for gl)
if [ -n "$output_option_libs" ]; then