From 166bcebb8e87aefb42de52d22d567a8fa316928d Mon Sep 17 00:00:00 2001 From: =?utf8?q?V=C3=A1clav=20Slav=C3=ADk?= Date: Thu, 22 Jul 2004 08:28:28 +0000 Subject: [PATCH] install headers in prefix/include/wx-version/wx/ instead of prefix/include/wx/ git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@28386 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- Makefile.in | 8 +++---- build/bakefiles/common_contrib.bkl | 1 + build/bakefiles/wx.bkl | 3 +++ configure | 16 +------------- configure.in | 13 ----------- contrib/src/animate/Makefile.in | 8 +++---- contrib/src/deprecated/Makefile.in | 8 +++---- contrib/src/fl/Makefile.in | 8 +++---- contrib/src/gizmos/Makefile.in | 8 +++---- contrib/src/mmedia/Makefile.in | 8 +++---- contrib/src/net/Makefile.in | 8 +++---- contrib/src/ogl/Makefile.in | 8 +++---- contrib/src/plot/Makefile.in | 8 +++---- contrib/src/stc/Makefile.in | 8 +++---- contrib/src/svg/Makefile.in | 8 +++---- contrib/src/xrc/Makefile.in | 8 +++---- src/stc/Makefile.in | 8 +++---- src/xrc/Makefile.in | 8 +++---- wx-config.in | 35 ++++-------------------------- 19 files changed, 65 insertions(+), 115 deletions(-) diff --git a/Makefile.in b/Makefile.in index 09231db754..5549dcbe84 100644 --- a/Makefile.in +++ b/Makefile.in @@ -6972,12 +6972,12 @@ install: all $(__install_wxregex___depname) $(__install_wxzlib___depname) $(__in (cd $(srcdir) ; $(INSTALL_DATA) wxwin.m4 $(DESTDIR)$(datadir)/aclocal) $(INSTALL_DIR) $(DESTDIR)$(libdir)/wx/include/$(TOOLCHAIN_NAME)/wx (cd ./ ; $(INSTALL_DATA) lib/wx/include/$(TOOLCHAIN_NAME)/wx/setup.h $(DESTDIR)$(libdir)/wx/include/$(TOOLCHAIN_NAME)/wx) - $(INSTALL_DIR) $(DESTDIR)$(includedir) + $(INSTALL_DIR) $(DESTDIR)$(includedir)/wx-2.5 for f in $(ALL_HEADERS); do \ - if test ! -d $(DESTDIR)$(includedir)/`dirname $$f` ; then \ - $(INSTALL_DIR) $(DESTDIR)$(includedir)/`dirname $$f`; \ + if test ! -d $(DESTDIR)$(includedir)/wx-2.5/`dirname $$f` ; then \ + $(INSTALL_DIR) $(DESTDIR)$(includedir)/wx-2.5/`dirname $$f`; \ fi; \ - $(INSTALL_DATA) $(srcdir)/include//$$f $(DESTDIR)$(includedir)/$$f; \ + $(INSTALL_DATA) $(srcdir)/include//$$f $(DESTDIR)$(includedir)/wx-2.5/$$f; \ done @echo " " @echo " ------------------------------------------------------" diff --git a/build/bakefiles/common_contrib.bkl b/build/bakefiles/common_contrib.bkl index feb1d67469..49c23c63aa 100644 --- a/build/bakefiles/common_contrib.bkl +++ b/build/bakefiles/common_contrib.bkl @@ -33,5 +33,6 @@ diff --git a/build/bakefiles/wx.bkl b/build/bakefiles/wx.bkl index eab78dd712..0067153498 100644 --- a/build/bakefiles/wx.bkl +++ b/build/bakefiles/wx.bkl @@ -81,6 +81,9 @@ $(SRCDIR)/include $(ALL_HEADERS) + + $(INCLUDEDIR)/wx-$(WXVER_MAJOR).$(WXVER_MINOR) + diff --git a/configure b/configure index d309658b2f..a2a64394e8 100755 --- a/configure +++ b/configure @@ -313,7 +313,7 @@ ac_includes_default="\ #endif" ac_subdirs_all="$ac_subdirs_all src/expat" -ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CPP EGREP CXX CXXFLAGS ac_ct_CXX RANLIB ac_ct_RANLIB AR INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA STRIP IF_GNU_MAKE LN_S CXXCPP subdirs PKG_CONFIG GTK_CFLAGS GTK_LIBS GTK_CONFIG PANGOFT2_CFLAGS PANGOFT2_LIBS X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS PANGOX_CFLAGS PANGOX_LIBS PANGOXFT_CFLAGS PANGOXFT_LIBS RESCOMP DEREZ SETFILE LIBICONV EXTRALIBS_ESD SDL_CONFIG SDL_CFLAGS SDL_LIBS CORE_BASE_LIBS CORE_GUI_LIBS wxUSE_ZLIB wxUSE_REGEX wxUSE_EXPAT wxUSE_ODBC wxUSE_LIBJPEG wxUSE_LIBPNG wxUSE_LIBTIFF VENDOR OFFICIAL_BUILD WXUNIV MONOLITHIC USE_PLUGINS EXTRALIBS EXTRALIBS_XML EXTRALIBS_HTML EXTRALIBS_ODBC EXTRALIBS_GUI EXTRALIBS_OPENGL EXTRALIBS_SDL WITH_PLUGIN_SDL UNICODE BUILD DEBUG_INFO DEBUG_FLAG SHARED TOOLKIT_LOWERCASE TOOLKIT_VERSION SAMPLES_RPATH_FLAG SAMPLES_RPATH_POSTLINK HOST_SUFFIX CPPUNIT_CFLAGS CPPUNIT_LIBS SET_MAKE MAKE_SET ac_ct_AR ac_ct_STRIP NM ac_ct_NM INSTALL_DIR LDFLAGS_GUI PLATFORM_UNIX PLATFORM_WIN32 PLATFORM_MSDOS PLATFORM_MAC PLATFORM_MACOSX PLATFORM_OS2 SO_SUFFIX SO_SUFFIX_MODULE DLLIMP_SUFFIX LIBPREFIX LIBEXT DLLPREFIX DLLPREFIX_MODULE AIX_CXX_LD SHARED_LD_CC SHARED_LD_CXX SHARED_LD_MODULE_CC SHARED_LD_MODULE_CXX PIC_FLAG USE_SOVERSION USE_SOVERLINUX USE_SOVERSOLARIS USE_MACVERSION USE_SOSYMLINKS SONAME_FLAG DEPS_TRACKING GCC_PCH COND_BUILD_DEBUG COND_BUILD_DEBUG_DEBUG_FLAG_DEFAULT COND_BUILD_DEBUG_DEBUG_INFO_DEFAULT COND_BUILD_DEBUG_UNICODE_0 COND_BUILD_DEBUG_UNICODE_1 COND_BUILD_RELEASE COND_BUILD_RELEASE_DEBUG_INFO_DEFAULT COND_BUILD_RELEASE_UNICODE_0 COND_BUILD_RELEASE_UNICODE_1 COND_DEBUG_FLAG_1 COND_DEBUG_INFO_0 COND_DEBUG_INFO_1 COND_DEPS_TRACKING_0 COND_DEPS_TRACKING_1 COND_GCC_PCH_1 COND_MONOLITHIC_0 COND_MONOLITHIC_0_SHARED_0 COND_MONOLITHIC_0_SHARED_0_USE_GUI_1 COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_ODBC_1 COND_MONOLITHIC_0_SHARED_0_USE_HTML_1 COND_MONOLITHIC_0_SHARED_0_USE_ODBC_1 COND_MONOLITHIC_0_SHARED_1 COND_MONOLITHIC_0_SHARED_1_USE_GUI_1 COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_ODBC_1 COND_MONOLITHIC_0_SHARED_1_USE_HTML_1 COND_MONOLITHIC_0_SHARED_1_USE_ODBC_1 COND_MONOLITHIC_0_USE_ODBC_1 COND_MONOLITHIC_1 COND_MONOLITHIC_1_SHARED_0 COND_MONOLITHIC_1_SHARED_1 COND_OFFICIAL_BUILD_0_PLATFORM_WIN32_1 COND_OFFICIAL_BUILD_1_PLATFORM_WIN32_1 COND_PLATFORM_MACOSX_0_USE_SOVERSION_1 COND_PLATFORM_MACOSX_1 COND_PLATFORM_MACOSX_1_TOOLKIT_COCOA COND_PLATFORM_MACOSX_1_TOOLKIT_GTK COND_PLATFORM_MACOSX_1_TOOLKIT_MAC COND_PLATFORM_MACOSX_1_USE_GUI_1 COND_PLATFORM_MACOSX_1_USE_SOVERSION_1 COND_PLATFORM_MAC_1 COND_PLATFORM_OS2_1 COND_PLATFORM_UNIX_0 COND_PLATFORM_UNIX_1 COND_PLATFORM_UNIX_1_USE_GUI_1 COND_PLATFORM_UNIX_1_USE_PLUGINS_0 COND_PLATFORM_WIN32_0 COND_PLATFORM_WIN32_1 COND_SHARED_0 COND_SHARED_0_USE_GUI_1_USE_OPENGL_1 COND_SHARED_0_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN COND_SHARED_0_USE_GUI_1_WXUSE_LIBPNG_BUILTIN COND_SHARED_0_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN COND_SHARED_0_WXUSE_EXPAT_BUILTIN COND_SHARED_0_WXUSE_ODBC_BUILTIN COND_SHARED_0_WXUSE_REGEX_BUILTIN COND_SHARED_0_WXUSE_ZLIB_BUILTIN COND_SHARED_1 COND_SHARED_1_USE_GUI_1_USE_OPENGL_1 COND_TOOLKIT_COCOA COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0 COND_TOOLKIT_GTK COND_TOOLKIT_GTK_USE_GUI_1 COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0 COND_TOOLKIT_MAC COND_TOOLKIT_MAC_USE_GUI_1 COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0 COND_TOOLKIT_MAC_WXUNIV_0 COND_TOOLKIT_MGL COND_TOOLKIT_MGL_USE_GUI_1 COND_TOOLKIT_MOTIF COND_TOOLKIT_MOTIF_USE_GUI_1 COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0 COND_TOOLKIT_MSW COND_TOOLKIT_MSW_USE_GUI_1 COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0 COND_TOOLKIT_MSW_WXUNIV_0 COND_TOOLKIT_PM COND_TOOLKIT_PM_USE_GUI_1 COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0 COND_TOOLKIT_PM_WXUNIV_0 COND_TOOLKIT_WINCE COND_TOOLKIT_WINCE_USE_GUI_1 COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0 COND_TOOLKIT_X11 COND_TOOLKIT_X11_USE_GUI_1 COND_UNICODE_1 COND_USE_EXCEPTIONS_0 COND_USE_EXCEPTIONS_1 COND_USE_GUI_0 COND_USE_GUI_1 COND_USE_GUI_1_WXUNIV_0 COND_USE_GUI_1_WXUNIV_1 COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN COND_USE_ODBC_1 COND_USE_PLUGINS_0 COND_USE_SOSYMLINKS_1 COND_USE_SOVERLINUX_1 COND_USE_SOVERSION_0 COND_USE_SOVERSOLARIS_1 COND_WITH_PLUGIN_SDL_1 COND_WITH_SDL_1 COND_WXUNIV_1 COND_WXUSE_EXPAT_BUILTIN COND_WXUSE_LIBJPEG_BUILTIN COND_WXUSE_LIBPNG_BUILTIN COND_WXUSE_LIBTIFF_BUILTIN COND_WXUSE_ODBC_BUILTIN COND_WXUSE_REGEX_BUILTIN COND_WXUSE_ZLIB_BUILTIN PATH_IFS WX_MAJOR_VERSION_NUMBER WX_MINOR_VERSION_NUMBER WX_RELEASE_NUMBER WX_LIBRARY_NAME_STATIC WX_LIBRARY_NAME_SHARED WX_LIBRARY_BASENAME_NOGUI WX_LIBRARY_BASENAME_GUI WX_LIBRARY_IMPORTLIB WX_TARGET_LIBRARY WX_LIBRARY_LINK1 WX_LIBRARY_LINK2 PROGRAM_EXT WX_LIBRARY_NAME_STATIC_GL WX_LIBRARY_NAME_SHARED_GL WX_TARGET_LIBRARY_GL WX_LIBRARY_LINK1_GL WX_LIBRARY_LINK2_GL WX_ALL WX_ALL_INSTALLED SHARED_LD WX_TARGET_LIBRARY_TYPE STATIC_FLAG WXDEBUG_DEFINE USE_GUI AFMINSTALL WIN32INSTALL TOOLKIT TOOLKIT_DIR TOOLKIT_VPATH TOOLCHAIN_NAME TOOLCHAIN_DEFS TOOLCHAIN_DLL_DEFS top_builddir_wxconfig cross_compiling WXCONFIG_EXTRALIBS WXCONFIG_LIBS WXCONFIG_LIBS_GL WXCONFIG_LIBS_STATIC WXCONFIG_LIBS_STATIC_GL WXCONFIG_INCLUDE WXCONFIG_RPATH WXCONFIG_LDFLAGS_GUI WXCONFIG_DATA_FILE WX_LARGEFILE_FLAGS GCC_PRAGMA_FLAGS CODE_GEN_FLAGS CODE_GEN_FLAGS_CXX ALL_OBJECTS ALL_HEADERS ALL_SOURCES GUIDIST PORT_FILES DISTDIR SAMPLES_SUBDIRS LDFLAGS_GL LDFLAGS_VERSIONING LDFLAGS_EXE OPENGL_LIBS DMALLOC_LIBS WX_VERSION_TAG RESFLAGS RESPROGRAMOBJ WX_RESOURCES_MACOSX_ASCII WX_RESOURCES_MACOSX_DATA LIBWXMACRES MACRESCOMP MACSETFILE MACRESWXCONFIG GCC GCC_SEARCHES_USR_LOCAL_INCLUDE DLLTOOL AS LD MAKEINFO INSTALL_LIBRARY CPPUNIT_CONFIG LIBOBJS LTLIBOBJS' +ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CPP EGREP CXX CXXFLAGS ac_ct_CXX RANLIB ac_ct_RANLIB AR INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA STRIP IF_GNU_MAKE LN_S CXXCPP subdirs PKG_CONFIG GTK_CFLAGS GTK_LIBS GTK_CONFIG PANGOFT2_CFLAGS PANGOFT2_LIBS X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS PANGOX_CFLAGS PANGOX_LIBS PANGOXFT_CFLAGS PANGOXFT_LIBS RESCOMP DEREZ SETFILE LIBICONV EXTRALIBS_ESD SDL_CONFIG SDL_CFLAGS SDL_LIBS CORE_BASE_LIBS CORE_GUI_LIBS wxUSE_ZLIB wxUSE_REGEX wxUSE_EXPAT wxUSE_ODBC wxUSE_LIBJPEG wxUSE_LIBPNG wxUSE_LIBTIFF VENDOR OFFICIAL_BUILD WXUNIV MONOLITHIC USE_PLUGINS EXTRALIBS EXTRALIBS_XML EXTRALIBS_HTML EXTRALIBS_ODBC EXTRALIBS_GUI EXTRALIBS_OPENGL EXTRALIBS_SDL WITH_PLUGIN_SDL UNICODE BUILD DEBUG_INFO DEBUG_FLAG SHARED TOOLKIT_LOWERCASE TOOLKIT_VERSION SAMPLES_RPATH_FLAG SAMPLES_RPATH_POSTLINK HOST_SUFFIX CPPUNIT_CFLAGS CPPUNIT_LIBS SET_MAKE MAKE_SET ac_ct_AR ac_ct_STRIP NM ac_ct_NM INSTALL_DIR LDFLAGS_GUI PLATFORM_UNIX PLATFORM_WIN32 PLATFORM_MSDOS PLATFORM_MAC PLATFORM_MACOSX PLATFORM_OS2 SO_SUFFIX SO_SUFFIX_MODULE DLLIMP_SUFFIX LIBPREFIX LIBEXT DLLPREFIX DLLPREFIX_MODULE AIX_CXX_LD SHARED_LD_CC SHARED_LD_CXX SHARED_LD_MODULE_CC SHARED_LD_MODULE_CXX PIC_FLAG USE_SOVERSION USE_SOVERLINUX USE_SOVERSOLARIS USE_MACVERSION USE_SOSYMLINKS SONAME_FLAG DEPS_TRACKING GCC_PCH COND_BUILD_DEBUG COND_BUILD_DEBUG_DEBUG_FLAG_DEFAULT COND_BUILD_DEBUG_DEBUG_INFO_DEFAULT COND_BUILD_DEBUG_UNICODE_0 COND_BUILD_DEBUG_UNICODE_1 COND_BUILD_RELEASE COND_BUILD_RELEASE_DEBUG_INFO_DEFAULT COND_BUILD_RELEASE_UNICODE_0 COND_BUILD_RELEASE_UNICODE_1 COND_DEBUG_FLAG_1 COND_DEBUG_INFO_0 COND_DEBUG_INFO_1 COND_DEPS_TRACKING_0 COND_DEPS_TRACKING_1 COND_GCC_PCH_1 COND_MONOLITHIC_0 COND_MONOLITHIC_0_SHARED_0 COND_MONOLITHIC_0_SHARED_0_USE_GUI_1 COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_ODBC_1 COND_MONOLITHIC_0_SHARED_0_USE_HTML_1 COND_MONOLITHIC_0_SHARED_0_USE_ODBC_1 COND_MONOLITHIC_0_SHARED_1 COND_MONOLITHIC_0_SHARED_1_USE_GUI_1 COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_ODBC_1 COND_MONOLITHIC_0_SHARED_1_USE_HTML_1 COND_MONOLITHIC_0_SHARED_1_USE_ODBC_1 COND_MONOLITHIC_0_USE_ODBC_1 COND_MONOLITHIC_1 COND_MONOLITHIC_1_SHARED_0 COND_MONOLITHIC_1_SHARED_1 COND_OFFICIAL_BUILD_0_PLATFORM_WIN32_1 COND_OFFICIAL_BUILD_1_PLATFORM_WIN32_1 COND_PLATFORM_MACOSX_0_USE_SOVERSION_1 COND_PLATFORM_MACOSX_1 COND_PLATFORM_MACOSX_1_TOOLKIT_COCOA COND_PLATFORM_MACOSX_1_TOOLKIT_GTK COND_PLATFORM_MACOSX_1_TOOLKIT_MAC COND_PLATFORM_MACOSX_1_USE_GUI_1 COND_PLATFORM_MACOSX_1_USE_SOVERSION_1 COND_PLATFORM_MAC_1 COND_PLATFORM_OS2_1 COND_PLATFORM_UNIX_0 COND_PLATFORM_UNIX_1 COND_PLATFORM_UNIX_1_USE_GUI_1 COND_PLATFORM_UNIX_1_USE_PLUGINS_0 COND_PLATFORM_WIN32_0 COND_PLATFORM_WIN32_1 COND_SHARED_0 COND_SHARED_0_USE_GUI_1_USE_OPENGL_1 COND_SHARED_0_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN COND_SHARED_0_USE_GUI_1_WXUSE_LIBPNG_BUILTIN COND_SHARED_0_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN COND_SHARED_0_WXUSE_EXPAT_BUILTIN COND_SHARED_0_WXUSE_ODBC_BUILTIN COND_SHARED_0_WXUSE_REGEX_BUILTIN COND_SHARED_0_WXUSE_ZLIB_BUILTIN COND_SHARED_1 COND_SHARED_1_USE_GUI_1_USE_OPENGL_1 COND_TOOLKIT_COCOA COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0 COND_TOOLKIT_GTK COND_TOOLKIT_GTK_USE_GUI_1 COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0 COND_TOOLKIT_MAC COND_TOOLKIT_MAC_USE_GUI_1 COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0 COND_TOOLKIT_MAC_WXUNIV_0 COND_TOOLKIT_MGL COND_TOOLKIT_MGL_USE_GUI_1 COND_TOOLKIT_MOTIF COND_TOOLKIT_MOTIF_USE_GUI_1 COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0 COND_TOOLKIT_MSW COND_TOOLKIT_MSW_USE_GUI_1 COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0 COND_TOOLKIT_MSW_WXUNIV_0 COND_TOOLKIT_PM COND_TOOLKIT_PM_USE_GUI_1 COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0 COND_TOOLKIT_PM_WXUNIV_0 COND_TOOLKIT_WINCE COND_TOOLKIT_WINCE_USE_GUI_1 COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0 COND_TOOLKIT_X11 COND_TOOLKIT_X11_USE_GUI_1 COND_UNICODE_1 COND_USE_EXCEPTIONS_0 COND_USE_EXCEPTIONS_1 COND_USE_GUI_0 COND_USE_GUI_1 COND_USE_GUI_1_WXUNIV_0 COND_USE_GUI_1_WXUNIV_1 COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN COND_USE_ODBC_1 COND_USE_PLUGINS_0 COND_USE_SOSYMLINKS_1 COND_USE_SOVERLINUX_1 COND_USE_SOVERSION_0 COND_USE_SOVERSOLARIS_1 COND_WITH_PLUGIN_SDL_1 COND_WITH_SDL_1 COND_WXUNIV_1 COND_WXUSE_EXPAT_BUILTIN COND_WXUSE_LIBJPEG_BUILTIN COND_WXUSE_LIBPNG_BUILTIN COND_WXUSE_LIBTIFF_BUILTIN COND_WXUSE_ODBC_BUILTIN COND_WXUSE_REGEX_BUILTIN COND_WXUSE_ZLIB_BUILTIN PATH_IFS WX_MAJOR_VERSION_NUMBER WX_MINOR_VERSION_NUMBER WX_RELEASE_NUMBER WX_LIBRARY_NAME_STATIC WX_LIBRARY_NAME_SHARED WX_LIBRARY_BASENAME_NOGUI WX_LIBRARY_BASENAME_GUI WX_LIBRARY_IMPORTLIB WX_TARGET_LIBRARY WX_LIBRARY_LINK1 WX_LIBRARY_LINK2 PROGRAM_EXT WX_LIBRARY_NAME_STATIC_GL WX_LIBRARY_NAME_SHARED_GL WX_TARGET_LIBRARY_GL WX_LIBRARY_LINK1_GL WX_LIBRARY_LINK2_GL WX_ALL WX_ALL_INSTALLED SHARED_LD WX_TARGET_LIBRARY_TYPE STATIC_FLAG WXDEBUG_DEFINE USE_GUI AFMINSTALL WIN32INSTALL TOOLKIT TOOLKIT_DIR TOOLKIT_VPATH TOOLCHAIN_NAME TOOLCHAIN_DEFS TOOLCHAIN_DLL_DEFS top_builddir_wxconfig cross_compiling WXCONFIG_EXTRALIBS WXCONFIG_LIBS WXCONFIG_LIBS_GL WXCONFIG_LIBS_STATIC WXCONFIG_LIBS_STATIC_GL WXCONFIG_INCLUDE WXCONFIG_RPATH WXCONFIG_LDFLAGS_GUI WXCONFIG_DATA_FILE WX_LARGEFILE_FLAGS GCC_PRAGMA_FLAGS CODE_GEN_FLAGS CODE_GEN_FLAGS_CXX ALL_OBJECTS ALL_HEADERS ALL_SOURCES GUIDIST PORT_FILES DISTDIR SAMPLES_SUBDIRS LDFLAGS_GL LDFLAGS_VERSIONING LDFLAGS_EXE OPENGL_LIBS DMALLOC_LIBS WX_VERSION_TAG RESFLAGS RESPROGRAMOBJ WX_RESOURCES_MACOSX_ASCII WX_RESOURCES_MACOSX_DATA LIBWXMACRES MACRESCOMP MACSETFILE MACRESWXCONFIG GCC DLLTOOL AS LD MAKEINFO INSTALL_LIBRARY CPPUNIT_CONFIG LIBOBJS LTLIBOBJS' ac_subst_files='' # Initialize some variables set by options. @@ -11780,18 +11780,6 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $ ac_compiler_gnu=$ac_cv_c_compiler_gnu -echo "$as_me:$LINENO: checking for /usr/local/include in default include path" >&5 -echo $ECHO_N "checking for /usr/local/include in default include path... $ECHO_C" >&6 -GCC_SEARCHES_USR_LOCAL_INCLUDE="no" -if test "$GCC" = "yes" ; then - echo | gcc -v -x c++ -E - 2>&1 | sed -n '/^#include &1 /dev/null \ - && GCC_SEARCHES_USR_LOCAL_INCLUDE="yes" -fi -echo "$as_me:$LINENO: result: $GCC_SEARCHES_USR_LOCAL_INCLUDE" >&5 -echo "${ECHO_T}$GCC_SEARCHES_USR_LOCAL_INCLUDE" >&6 - if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args. set dummy ${ac_tool_prefix}ranlib; ac_word=$2 @@ -41110,7 +41098,6 @@ SAMPLES_SUBDIRS="`echo $SAMPLES_SUBDIRS | tr -s ' ' | tr ' ' '\n' | sort | uniq - echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5 @@ -42260,7 +42247,6 @@ s,@MACRESCOMP@,$MACRESCOMP,;t t s,@MACSETFILE@,$MACSETFILE,;t t s,@MACRESWXCONFIG@,$MACRESWXCONFIG,;t t s,@GCC@,$GCC,;t t -s,@GCC_SEARCHES_USR_LOCAL_INCLUDE@,$GCC_SEARCHES_USR_LOCAL_INCLUDE,;t t s,@DLLTOOL@,$DLLTOOL,;t t s,@AS@,$AS,;t t s,@LD@,$LD,;t t diff --git a/configure.in b/configure.in index 94f7a16e15..5d6787ba45 100644 --- a/configure.in +++ b/configure.in @@ -1353,18 +1353,6 @@ AC_PROG_CXX AC_LANG_RESTORE -dnl check if compiler includes /usr/local/include in -dnl default include files search path. -AC_MSG_CHECKING([for /usr/local/include in default include path]) -GCC_SEARCHES_USR_LOCAL_INCLUDE="no" -if test "$GCC" = "yes" ; then - echo | gcc -v -x c++ -E - 2>&1 | sed -n '/^#include &1 /dev/null \ - && GCC_SEARCHES_USR_LOCAL_INCLUDE="yes" -fi -AC_MSG_RESULT([$GCC_SEARCHES_USR_LOCAL_INCLUDE]) - dnl ranlib command dnl defines RANLIB with the appropriate command AC_PROG_RANLIB @@ -6246,7 +6234,6 @@ AC_SUBST(MACRESWXCONFIG) dnl other tools AC_SUBST(GCC) -AC_SUBST(GCC_SEARCHES_USR_LOCAL_INCLUDE) AC_SUBST(DLLTOOL) AC_SUBST(AS) AC_SUBST(NM) diff --git a/contrib/src/animate/Makefile.in b/contrib/src/animate/Makefile.in index 3672a58c09..bde8c136d7 100644 --- a/contrib/src/animate/Makefile.in +++ b/contrib/src/animate/Makefile.in @@ -172,12 +172,12 @@ COND_SHARED_0___animatelib___depname = \ all: $(__animatedll___depname) $(__animatelib___depname) install: all $(__install_animatedll___depname) $(__install_animatelib___depname) - $(INSTALL_DIR) $(DESTDIR)$(includedir) + $(INSTALL_DIR) $(DESTDIR)$(includedir)/wx-2.5 for f in wx/animate/animate.h; do \ - if test ! -d $(DESTDIR)$(includedir)/`dirname $$f` ; then \ - $(INSTALL_DIR) $(DESTDIR)$(includedir)/`dirname $$f`; \ + if test ! -d $(DESTDIR)$(includedir)/wx-2.5/`dirname $$f` ; then \ + $(INSTALL_DIR) $(DESTDIR)$(includedir)/wx-2.5/`dirname $$f`; \ fi; \ - $(INSTALL_DATA) $(srcdir)/../../include//$$f $(DESTDIR)$(includedir)/$$f; \ + $(INSTALL_DATA) $(srcdir)/../../include//$$f $(DESTDIR)$(includedir)/wx-2.5/$$f; \ done uninstall: diff --git a/contrib/src/deprecated/Makefile.in b/contrib/src/deprecated/Makefile.in index fd6e9021e4..549ceab32b 100644 --- a/contrib/src/deprecated/Makefile.in +++ b/contrib/src/deprecated/Makefile.in @@ -199,12 +199,12 @@ COND_SHARED_0___deprecatedlib___depname = \ all: $(__deprecateddll___depname) $(__deprecatedlib___depname) install: all $(__install_deprecateddll___depname) $(__install_deprecatedlib___depname) - $(INSTALL_DIR) $(DESTDIR)$(includedir) + $(INSTALL_DIR) $(DESTDIR)$(includedir)/wx-2.5 for f in wx/deprecated/expr.h wx/deprecated/prop.h wx/deprecated/propform.h wx/deprecated/proplist.h wx/deprecated/resource.h wx/deprecated/setup.h wx/deprecated/tbarsmpl.h wx/deprecated/treelay.h wx/deprecated/wxexpr.h; do \ - if test ! -d $(DESTDIR)$(includedir)/`dirname $$f` ; then \ - $(INSTALL_DIR) $(DESTDIR)$(includedir)/`dirname $$f`; \ + if test ! -d $(DESTDIR)$(includedir)/wx-2.5/`dirname $$f` ; then \ + $(INSTALL_DIR) $(DESTDIR)$(includedir)/wx-2.5/`dirname $$f`; \ fi; \ - $(INSTALL_DATA) $(srcdir)/../../include//$$f $(DESTDIR)$(includedir)/$$f; \ + $(INSTALL_DATA) $(srcdir)/../../include//$$f $(DESTDIR)$(includedir)/wx-2.5/$$f; \ done uninstall: diff --git a/contrib/src/fl/Makefile.in b/contrib/src/fl/Makefile.in index bd91c54cfb..c3025636cc 100644 --- a/contrib/src/fl/Makefile.in +++ b/contrib/src/fl/Makefile.in @@ -203,12 +203,12 @@ COND_SHARED_0___fllib___depname = \ all: $(__fldll___depname) $(__fllib___depname) install: all $(__install_fldll___depname) $(__install_fllib___depname) - $(INSTALL_DIR) $(DESTDIR)$(includedir) + $(INSTALL_DIR) $(DESTDIR)$(includedir)/wx-2.5 for f in wx/fl/antiflickpl.h wx/fl/bardragpl.h wx/fl/barhintspl.h wx/fl/cbcustom.h wx/fl/controlbar.h wx/fl/dynbarhnd.h wx/fl/dyntbar.h wx/fl/dyntbarhnd.h wx/fl/fldefs.h wx/fl/frmview.h wx/fl/garbagec.h wx/fl/gcupdatesmgr.h wx/fl/hintanimpl.h wx/fl/newbmpbtn.h wx/fl/panedrawpl.h wx/fl/rowdragpl.h wx/fl/rowlayoutpl.h wx/fl/toolwnd.h wx/fl/updatesmgr.h; do \ - if test ! -d $(DESTDIR)$(includedir)/`dirname $$f` ; then \ - $(INSTALL_DIR) $(DESTDIR)$(includedir)/`dirname $$f`; \ + if test ! -d $(DESTDIR)$(includedir)/wx-2.5/`dirname $$f` ; then \ + $(INSTALL_DIR) $(DESTDIR)$(includedir)/wx-2.5/`dirname $$f`; \ fi; \ - $(INSTALL_DATA) $(srcdir)/../../include//$$f $(DESTDIR)$(includedir)/$$f; \ + $(INSTALL_DATA) $(srcdir)/../../include//$$f $(DESTDIR)$(includedir)/wx-2.5/$$f; \ done uninstall: diff --git a/contrib/src/gizmos/Makefile.in b/contrib/src/gizmos/Makefile.in index 3d5d091d60..0dbcbca1e5 100644 --- a/contrib/src/gizmos/Makefile.in +++ b/contrib/src/gizmos/Makefile.in @@ -181,12 +181,12 @@ COND_SHARED_0___gizmoslib___depname = \ all: $(__gizmosdll___depname) $(__gizmoslib___depname) install: all $(__install_gizmosdll___depname) $(__install_gizmoslib___depname) - $(INSTALL_DIR) $(DESTDIR)$(includedir) + $(INSTALL_DIR) $(DESTDIR)$(includedir)/wx-2.5 for f in wx/gizmos/dynamicsash.h wx/gizmos/editlbox.h wx/gizmos/ledctrl.h wx/gizmos/multicell.h wx/gizmos/splittree.h wx/gizmos/statpict.h wx/gizmos/gizmos.h; do \ - if test ! -d $(DESTDIR)$(includedir)/`dirname $$f` ; then \ - $(INSTALL_DIR) $(DESTDIR)$(includedir)/`dirname $$f`; \ + if test ! -d $(DESTDIR)$(includedir)/wx-2.5/`dirname $$f` ; then \ + $(INSTALL_DIR) $(DESTDIR)$(includedir)/wx-2.5/`dirname $$f`; \ fi; \ - $(INSTALL_DATA) $(srcdir)/../../include//$$f $(DESTDIR)$(includedir)/$$f; \ + $(INSTALL_DATA) $(srcdir)/../../include//$$f $(DESTDIR)$(includedir)/wx-2.5/$$f; \ done uninstall: diff --git a/contrib/src/mmedia/Makefile.in b/contrib/src/mmedia/Makefile.in index eca9edfa3a..1c72ec17cf 100644 --- a/contrib/src/mmedia/Makefile.in +++ b/contrib/src/mmedia/Makefile.in @@ -224,12 +224,12 @@ COND_PLATFORM_UNIX_1___MMEDIA_PLATFORM_SRC_OBJECTS_1 = \ all: $(__mmediadll___depname) $(__mmedialib___depname) install: all $(__install_mmediadll___depname) $(__install_mmedialib___depname) - $(INSTALL_DIR) $(DESTDIR)$(includedir) + $(INSTALL_DIR) $(DESTDIR)$(includedir)/wx-2.5 for f in wx/mmedia/cdbase.h wx/mmedia/cdunix.h wx/mmedia/cdwin.h wx/mmedia/sndaiff.h wx/mmedia/sndbase.h wx/mmedia/sndcodec.h wx/mmedia/sndcpcm.h wx/mmedia/sndesd.h wx/mmedia/sndfile.h wx/mmedia/sndg72x.h wx/mmedia/sndmsad.h wx/mmedia/sndoss.h wx/mmedia/sndpcm.h wx/mmedia/sndulaw.h wx/mmedia/sndwav.h wx/mmedia/sndwin.h wx/mmedia/vidbase.h wx/mmedia/vidwin.h wx/mmedia/vidxanm.h; do \ - if test ! -d $(DESTDIR)$(includedir)/`dirname $$f` ; then \ - $(INSTALL_DIR) $(DESTDIR)$(includedir)/`dirname $$f`; \ + if test ! -d $(DESTDIR)$(includedir)/wx-2.5/`dirname $$f` ; then \ + $(INSTALL_DIR) $(DESTDIR)$(includedir)/wx-2.5/`dirname $$f`; \ fi; \ - $(INSTALL_DATA) $(srcdir)/../../include//$$f $(DESTDIR)$(includedir)/$$f; \ + $(INSTALL_DATA) $(srcdir)/../../include//$$f $(DESTDIR)$(includedir)/wx-2.5/$$f; \ done uninstall: diff --git a/contrib/src/net/Makefile.in b/contrib/src/net/Makefile.in index d51fd4c2b4..62e2c21a99 100644 --- a/contrib/src/net/Makefile.in +++ b/contrib/src/net/Makefile.in @@ -176,12 +176,12 @@ COND_SHARED_0___netutilslib___depname = \ all: $(__netutilsdll___depname) $(__netutilslib___depname) install: all $(__install_netutilsdll___depname) $(__install_netutilslib___depname) - $(INSTALL_DIR) $(DESTDIR)$(includedir) + $(INSTALL_DIR) $(DESTDIR)$(includedir)/wx-2.5 for f in wx/net/email.h wx/net/msg.h wx/net/smapi.h wx/net/web.h; do \ - if test ! -d $(DESTDIR)$(includedir)/`dirname $$f` ; then \ - $(INSTALL_DIR) $(DESTDIR)$(includedir)/`dirname $$f`; \ + if test ! -d $(DESTDIR)$(includedir)/wx-2.5/`dirname $$f` ; then \ + $(INSTALL_DIR) $(DESTDIR)$(includedir)/wx-2.5/`dirname $$f`; \ fi; \ - $(INSTALL_DATA) $(srcdir)/../../include//$$f $(DESTDIR)$(includedir)/$$f; \ + $(INSTALL_DATA) $(srcdir)/../../include//$$f $(DESTDIR)$(includedir)/wx-2.5/$$f; \ done uninstall: diff --git a/contrib/src/ogl/Makefile.in b/contrib/src/ogl/Makefile.in index e8cc234a89..ceaf30170b 100644 --- a/contrib/src/ogl/Makefile.in +++ b/contrib/src/ogl/Makefile.in @@ -193,12 +193,12 @@ COND_SHARED_0___ogllib___depname = \ all: $(__ogldll___depname) $(__ogllib___depname) install: all $(__install_ogldll___depname) $(__install_ogllib___depname) - $(INSTALL_DIR) $(DESTDIR)$(includedir) + $(INSTALL_DIR) $(DESTDIR)$(includedir)/wx-2.5 for f in wx/ogl/basic.h wx/ogl/basicp.h wx/ogl/bmpshape.h wx/ogl/canvas.h wx/ogl/composit.h wx/ogl/constrnt.h wx/ogl/divided.h wx/ogl/drawn.h wx/ogl/drawnp.h wx/ogl/lines.h wx/ogl/linesp.h wx/ogl/mfutils.h wx/ogl/misc.h wx/ogl/ogldiag.h wx/ogl/ogl.h; do \ - if test ! -d $(DESTDIR)$(includedir)/`dirname $$f` ; then \ - $(INSTALL_DIR) $(DESTDIR)$(includedir)/`dirname $$f`; \ + if test ! -d $(DESTDIR)$(includedir)/wx-2.5/`dirname $$f` ; then \ + $(INSTALL_DIR) $(DESTDIR)$(includedir)/wx-2.5/`dirname $$f`; \ fi; \ - $(INSTALL_DATA) $(srcdir)/../../include//$$f $(DESTDIR)$(includedir)/$$f; \ + $(INSTALL_DATA) $(srcdir)/../../include//$$f $(DESTDIR)$(includedir)/wx-2.5/$$f; \ done uninstall: diff --git a/contrib/src/plot/Makefile.in b/contrib/src/plot/Makefile.in index 497e5ad270..a309fa9ae3 100644 --- a/contrib/src/plot/Makefile.in +++ b/contrib/src/plot/Makefile.in @@ -171,12 +171,12 @@ COND_SHARED_0___plotlib___depname = \ all: $(__plotdll___depname) $(__plotlib___depname) install: all $(__install_plotdll___depname) $(__install_plotlib___depname) - $(INSTALL_DIR) $(DESTDIR)$(includedir) + $(INSTALL_DIR) $(DESTDIR)$(includedir)/wx-2.5 for f in wx/plot/plot.h wx/plot/plot_dwn.bmp wx/plot/plot_enl.bmp wx/plot/plot_shr.bmp wx/plot/plot_up.bmp wx/plot/plot_zin.bmp wx/plot/plot_zot.bmp wx/plot/wxplot.rc; do \ - if test ! -d $(DESTDIR)$(includedir)/`dirname $$f` ; then \ - $(INSTALL_DIR) $(DESTDIR)$(includedir)/`dirname $$f`; \ + if test ! -d $(DESTDIR)$(includedir)/wx-2.5/`dirname $$f` ; then \ + $(INSTALL_DIR) $(DESTDIR)$(includedir)/wx-2.5/`dirname $$f`; \ fi; \ - $(INSTALL_DATA) $(srcdir)/../../include//$$f $(DESTDIR)$(includedir)/$$f; \ + $(INSTALL_DATA) $(srcdir)/../../include//$$f $(DESTDIR)$(includedir)/wx-2.5/$$f; \ done uninstall: diff --git a/contrib/src/stc/Makefile.in b/contrib/src/stc/Makefile.in index a3ea1a9111..b759007599 100644 --- a/contrib/src/stc/Makefile.in +++ b/contrib/src/stc/Makefile.in @@ -286,12 +286,12 @@ COND_SHARED_0___stclib___depname = \ all: $(__stcdll___depname) $(__stclib___depname) install: all $(__install_stcdll___depname) $(__install_stclib___depname) - $(INSTALL_DIR) $(DESTDIR)$(includedir) + $(INSTALL_DIR) $(DESTDIR)$(includedir)/wx-2.5 for f in wx/stc/stc.h; do \ - if test ! -d $(DESTDIR)$(includedir)/`dirname $$f` ; then \ - $(INSTALL_DIR) $(DESTDIR)$(includedir)/`dirname $$f`; \ + if test ! -d $(DESTDIR)$(includedir)/wx-2.5/`dirname $$f` ; then \ + $(INSTALL_DIR) $(DESTDIR)$(includedir)/wx-2.5/`dirname $$f`; \ fi; \ - $(INSTALL_DATA) $(srcdir)/../../include//$$f $(DESTDIR)$(includedir)/$$f; \ + $(INSTALL_DATA) $(srcdir)/../../include//$$f $(DESTDIR)$(includedir)/wx-2.5/$$f; \ done uninstall: diff --git a/contrib/src/svg/Makefile.in b/contrib/src/svg/Makefile.in index 71eda11904..b3ff61d02b 100644 --- a/contrib/src/svg/Makefile.in +++ b/contrib/src/svg/Makefile.in @@ -171,12 +171,12 @@ COND_SHARED_0___svglib___depname = \ all: $(__svgdll___depname) $(__svglib___depname) install: all $(__install_svgdll___depname) $(__install_svglib___depname) - $(INSTALL_DIR) $(DESTDIR)$(includedir) + $(INSTALL_DIR) $(DESTDIR)$(includedir)/wx-2.5 for f in wx/svg/dcsvg.h; do \ - if test ! -d $(DESTDIR)$(includedir)/`dirname $$f` ; then \ - $(INSTALL_DIR) $(DESTDIR)$(includedir)/`dirname $$f`; \ + if test ! -d $(DESTDIR)$(includedir)/wx-2.5/`dirname $$f` ; then \ + $(INSTALL_DIR) $(DESTDIR)$(includedir)/wx-2.5/`dirname $$f`; \ fi; \ - $(INSTALL_DATA) $(srcdir)/../../include//$$f $(DESTDIR)$(includedir)/$$f; \ + $(INSTALL_DATA) $(srcdir)/../../include//$$f $(DESTDIR)$(includedir)/wx-2.5/$$f; \ done uninstall: diff --git a/contrib/src/xrc/Makefile.in b/contrib/src/xrc/Makefile.in index 294e32912e..d8a24020d8 100644 --- a/contrib/src/xrc/Makefile.in +++ b/contrib/src/xrc/Makefile.in @@ -258,12 +258,12 @@ COND_SHARED_0___xrclib___depname = \ all: $(__xrcdll___depname) $(__xrclib___depname) install: all $(__install_xrcdll___depname) $(__install_xrclib___depname) - $(INSTALL_DIR) $(DESTDIR)$(includedir) + $(INSTALL_DIR) $(DESTDIR)$(includedir)/wx-2.5 for f in wx/xrc/xmlres.h wx/xrc/xh_all.h wx/xrc/xh_bmp.h wx/xrc/xh_bmpbt.h wx/xrc/xh_bttn.h wx/xrc/xh_cald.h wx/xrc/xh_chckb.h wx/xrc/xh_chckl.h wx/xrc/xh_choic.h wx/xrc/xh_combo.h wx/xrc/xh_dlg.h wx/xrc/xh_frame.h wx/xrc/xh_gauge.h wx/xrc/xh_gdctl.h wx/xrc/xh_html.h wx/xrc/xh_listb.h wx/xrc/xh_listc.h wx/xrc/xh_menu.h wx/xrc/xh_notbk.h wx/xrc/xh_panel.h wx/xrc/xh_radbt.h wx/xrc/xh_radbx.h wx/xrc/xh_scrol.h wx/xrc/xh_scwin.h wx/xrc/xh_sizer.h wx/xrc/xh_slidr.h wx/xrc/xh_spin.h wx/xrc/xh_split.h wx/xrc/xh_statbar.h wx/xrc/xh_stbmp.h wx/xrc/xh_stbox.h wx/xrc/xh_stlin.h wx/xrc/xh_sttxt.h wx/xrc/xh_text.h wx/xrc/xh_toolb.h wx/xrc/xh_tree.h wx/xrc/xh_unkwn.h wx/xrc/xh_wizrd.h; do \ - if test ! -d $(DESTDIR)$(includedir)/`dirname $$f` ; then \ - $(INSTALL_DIR) $(DESTDIR)$(includedir)/`dirname $$f`; \ + if test ! -d $(DESTDIR)$(includedir)/wx-2.5/`dirname $$f` ; then \ + $(INSTALL_DIR) $(DESTDIR)$(includedir)/wx-2.5/`dirname $$f`; \ fi; \ - $(INSTALL_DATA) $(srcdir)/../../include//$$f $(DESTDIR)$(includedir)/$$f; \ + $(INSTALL_DATA) $(srcdir)/../../include//$$f $(DESTDIR)$(includedir)/wx-2.5/$$f; \ done uninstall: diff --git a/src/stc/Makefile.in b/src/stc/Makefile.in index a3ea1a9111..b759007599 100644 --- a/src/stc/Makefile.in +++ b/src/stc/Makefile.in @@ -286,12 +286,12 @@ COND_SHARED_0___stclib___depname = \ all: $(__stcdll___depname) $(__stclib___depname) install: all $(__install_stcdll___depname) $(__install_stclib___depname) - $(INSTALL_DIR) $(DESTDIR)$(includedir) + $(INSTALL_DIR) $(DESTDIR)$(includedir)/wx-2.5 for f in wx/stc/stc.h; do \ - if test ! -d $(DESTDIR)$(includedir)/`dirname $$f` ; then \ - $(INSTALL_DIR) $(DESTDIR)$(includedir)/`dirname $$f`; \ + if test ! -d $(DESTDIR)$(includedir)/wx-2.5/`dirname $$f` ; then \ + $(INSTALL_DIR) $(DESTDIR)$(includedir)/wx-2.5/`dirname $$f`; \ fi; \ - $(INSTALL_DATA) $(srcdir)/../../include//$$f $(DESTDIR)$(includedir)/$$f; \ + $(INSTALL_DATA) $(srcdir)/../../include//$$f $(DESTDIR)$(includedir)/wx-2.5/$$f; \ done uninstall: diff --git a/src/xrc/Makefile.in b/src/xrc/Makefile.in index 294e32912e..d8a24020d8 100644 --- a/src/xrc/Makefile.in +++ b/src/xrc/Makefile.in @@ -258,12 +258,12 @@ COND_SHARED_0___xrclib___depname = \ all: $(__xrcdll___depname) $(__xrclib___depname) install: all $(__install_xrcdll___depname) $(__install_xrclib___depname) - $(INSTALL_DIR) $(DESTDIR)$(includedir) + $(INSTALL_DIR) $(DESTDIR)$(includedir)/wx-2.5 for f in wx/xrc/xmlres.h wx/xrc/xh_all.h wx/xrc/xh_bmp.h wx/xrc/xh_bmpbt.h wx/xrc/xh_bttn.h wx/xrc/xh_cald.h wx/xrc/xh_chckb.h wx/xrc/xh_chckl.h wx/xrc/xh_choic.h wx/xrc/xh_combo.h wx/xrc/xh_dlg.h wx/xrc/xh_frame.h wx/xrc/xh_gauge.h wx/xrc/xh_gdctl.h wx/xrc/xh_html.h wx/xrc/xh_listb.h wx/xrc/xh_listc.h wx/xrc/xh_menu.h wx/xrc/xh_notbk.h wx/xrc/xh_panel.h wx/xrc/xh_radbt.h wx/xrc/xh_radbx.h wx/xrc/xh_scrol.h wx/xrc/xh_scwin.h wx/xrc/xh_sizer.h wx/xrc/xh_slidr.h wx/xrc/xh_spin.h wx/xrc/xh_split.h wx/xrc/xh_statbar.h wx/xrc/xh_stbmp.h wx/xrc/xh_stbox.h wx/xrc/xh_stlin.h wx/xrc/xh_sttxt.h wx/xrc/xh_text.h wx/xrc/xh_toolb.h wx/xrc/xh_tree.h wx/xrc/xh_unkwn.h wx/xrc/xh_wizrd.h; do \ - if test ! -d $(DESTDIR)$(includedir)/`dirname $$f` ; then \ - $(INSTALL_DIR) $(DESTDIR)$(includedir)/`dirname $$f`; \ + if test ! -d $(DESTDIR)$(includedir)/wx-2.5/`dirname $$f` ; then \ + $(INSTALL_DIR) $(DESTDIR)$(includedir)/wx-2.5/`dirname $$f`; \ fi; \ - $(INSTALL_DATA) $(srcdir)/../../include//$$f $(DESTDIR)$(includedir)/$$f; \ + $(INSTALL_DATA) $(srcdir)/../../include//$$f $(DESTDIR)$(includedir)/wx-2.5/$$f; \ done uninstall: diff --git a/wx-config.in b/wx-config.in index d92f5c1530..9e34fc5a08 100755 --- a/wx-config.in +++ b/wx-config.in @@ -29,7 +29,6 @@ update_prefixes CC="@CC@" GCC="@GCC@" -GCC_SEARCHES_USR_LOCAL_INCLUDE="@GCC_SEARCHES_USR_LOCAL_INCLUDE@" CXX="@CXX@" LD="@SHARED_LD@" srcdir="@top_srcdir@" @@ -194,41 +193,15 @@ EOF cppflags() { - # we should never specify -I/usr/include on the compiler command line: this - # is at best useless and at worst breaks compilation on the systems where - # the system headers are non-ANSI because gcc works around this by storing - # the ANSI-fied versions of them in its private directory which is searched - # after all the directories on the cmd line. - # - # the situation is a bit more complicated with -I/usr/local/include: - # it shouldn't be specified with some gcc installations which look there - # by default anyhow and give warnings (at least 3.1 does) if it is - # specified explicitly -- - # but this -I switch *is* needed for other gcc installation and for - # the other compilers. - # So I put a suitable test into configure.in and reuse the result here. - # - # note that we assume that if we use GNU cc we also use GNU c++ and vice - # versa, i.e. this won't work (either for --cflags or --cxxflags) if GNU C - # compiler and non-GNU C++ compiler are used or vice versa -- we'll fix - # this when/if anybody complains about it - if test "${includedir}" != "/usr/include" \ - -a "${includedir}" != "/usr/include/c++" \ - -a \( "${GCC_SEARCHES_USR_LOCAL_INCLUDE}" != "yes" \ - -o "${includedir}" != "/usr/local/include" \) \ - -a \( "${cross_compiling}" != "yes" \ - -o "${includedir}" != "/usr/${target}/include" \) ; - then - includes=" -I${includedir}" - fi - - includes="-I${libdir}/wx/include/${TOOLCHAIN_NAME}$includes" + includes="-I${libdir}/wx/include/${TOOLCHAIN_NAME}" # in inplace case we need to also add path to contrib headers -- do it # unconditionally as they might be used and we have no way of knowing if # they really are if test $inplace_flag = yes ; then - includes="$includes -I${prefix}/contrib/include" + includes="$includes -I${prefix}/include -I${prefix}/contrib/include" + else + includes="$includes -I${includedir}/wx-${WX_MAJOR_VERSION_NUMBER}.${WX_MINOR_VERSION_NUMBER}" fi flags="$includes ${WXDEBUG_DEFINE} ${TOOLCHAIN_DEFS}" -- 2.45.2