diff -Naur src.original/Makefile.unix src/Makefile.unix --- src.original/Makefile.unix 2005-08-05 12:04:38.000000000 -0500 +++ src/Makefile.unix 2005-08-05 12:19:15.000000000 -0500 @@ -76,8 +76,8 @@ console_runner_RESCOMP= ### Compiler/linker options -tinyXML_GLOBAL_CFLAGS= -tinyXML_PROJECT_CFLAGS= -Wall -g `wx-config --cflags` +tinyXML_GLOBAL_CFLAGS= ${CXXFLAGS} -fPIC +tinyXML_PROJECT_CFLAGS= -Wall `wx-config --cflags` tinyXML_GLOBAL_LDFLAGS= tinyXML_PROJECT_LDFLAGS= `wx-config --libs` tinyXML_GLOBAL_INCS= -I/usr/include @@ -86,8 +86,8 @@ tinyXML_PROJECT_LIBDIRS= -Lsdk/tinyxml tinyXML_GLOBAL_LIBS= tinyXML_PROJECT_LIBS= -sdk_GLOBAL_CFLAGS= -sdk_PROJECT_CFLAGS= -Wall -g `wx-config --cflags` +sdk_GLOBAL_CFLAGS= ${CXXFLAGS} +sdk_PROJECT_CFLAGS= -Wall `wx-config --cflags` sdk_GLOBAL_LDFLAGS= sdk_PROJECT_LDFLAGS= `wx-config --libs` sdk_GLOBAL_INCS= -I/usr/include @@ -96,8 +96,8 @@ sdk_PROJECT_LIBDIRS= -Lsdk/tinyxml sdk_GLOBAL_LIBS= sdk_PROJECT_LIBS= -src_GLOBAL_CFLAGS= -src_PROJECT_CFLAGS= -Wall -g `wx-config --cflags` +src_GLOBAL_CFLAGS= ${CXXFLAGS} +src_PROJECT_CFLAGS= -Wall `wx-config --cflags` src_GLOBAL_LDFLAGS= src_PROJECT_LDFLAGS= `wx-config --libs` src_GLOBAL_INCS= -I/usr/include @@ -106,8 +106,8 @@ src_PROJECT_LIBDIRS= -Lsdk/tinyxml src_GLOBAL_LIBS= src_PROJECT_LIBS= -plugin_Astyle_GLOBAL_CFLAGS= -plugin_Astyle_PROJECT_CFLAGS= -Wall -g `wx-config --cflags` +plugin_Astyle_GLOBAL_CFLAGS= ${CXXFLAGS} +plugin_Astyle_PROJECT_CFLAGS= -Wall `wx-config --cflags` plugin_Astyle_GLOBAL_LDFLAGS= plugin_Astyle_PROJECT_LDFLAGS= `wx-config --libs` plugin_Astyle_GLOBAL_INCS= -I/usr/include @@ -116,8 +116,8 @@ plugin_Astyle_PROJECT_LIBDIRS= -Lsdk/tinyxml plugin_Astyle_GLOBAL_LIBS= plugin_Astyle_PROJECT_LIBS= -plugin_CompilerGCC_GLOBAL_CFLAGS= -plugin_CompilerGCC_PROJECT_CFLAGS= -Wall -g `wx-config --cflags` +plugin_CompilerGCC_GLOBAL_CFLAGS= ${CXXFLAGS} +plugin_CompilerGCC_PROJECT_CFLAGS= -Wall `wx-config --cflags` plugin_CompilerGCC_GLOBAL_LDFLAGS= plugin_CompilerGCC_PROJECT_LDFLAGS= `wx-config --libs` plugin_CompilerGCC_GLOBAL_INCS= -I/usr/include @@ -126,8 +126,8 @@ plugin_CompilerGCC_PROJECT_LIBDIRS= -Lsdk/tinyxml plugin_CompilerGCC_GLOBAL_LIBS= plugin_CompilerGCC_PROJECT_LIBS= -plugin_DebuggerGDB_GLOBAL_CFLAGS= -plugin_DebuggerGDB_PROJECT_CFLAGS= -Wall -g `wx-config --cflags` +plugin_DebuggerGDB_GLOBAL_CFLAGS= ${CXXFLAGS} +plugin_DebuggerGDB_PROJECT_CFLAGS= -Wall `wx-config --cflags` plugin_DebuggerGDB_GLOBAL_LDFLAGS= plugin_DebuggerGDB_PROJECT_LDFLAGS= `wx-config --libs` plugin_DebuggerGDB_GLOBAL_INCS= -I/usr/include @@ -136,8 +136,8 @@ plugin_DebuggerGDB_PROJECT_LIBDIRS= -Lsdk/tinyxml plugin_DebuggerGDB_GLOBAL_LIBS= plugin_DebuggerGDB_PROJECT_LIBS= -plugin_CodeCompletion_GLOBAL_CFLAGS= -plugin_CodeCompletion_PROJECT_CFLAGS= -Wall -g `wx-config --cflags` +plugin_CodeCompletion_GLOBAL_CFLAGS= ${CXXFLAGS} +plugin_CodeCompletion_PROJECT_CFLAGS= -Wall `wx-config --cflags` plugin_CodeCompletion_GLOBAL_LDFLAGS= plugin_CodeCompletion_PROJECT_LDFLAGS= `wx-config --libs` plugin_CodeCompletion_GLOBAL_INCS= -I/usr/include @@ -146,8 +146,8 @@ plugin_CodeCompletion_PROJECT_LIBDIRS= -Lsdk/tinyxml plugin_CodeCompletion_GLOBAL_LIBS= plugin_CodeCompletion_PROJECT_LIBS= -plugin_ClassWizard_GLOBAL_CFLAGS= -plugin_ClassWizard_PROJECT_CFLAGS= -Wall -g `wx-config --cflags` +plugin_ClassWizard_GLOBAL_CFLAGS= ${CXXFLAGS} +plugin_ClassWizard_PROJECT_CFLAGS= -Wall `wx-config --cflags` plugin_ClassWizard_GLOBAL_LDFLAGS= plugin_ClassWizard_PROJECT_LDFLAGS= `wx-config --libs` plugin_ClassWizard_GLOBAL_INCS= -I/usr/include @@ -156,8 +156,8 @@ plugin_ClassWizard_PROJECT_LIBDIRS= -Lsdk/tinyxml plugin_ClassWizard_GLOBAL_LIBS= plugin_ClassWizard_PROJECT_LIBS= -plugin_DefMimeHandler_GLOBAL_CFLAGS= -plugin_DefMimeHandler_PROJECT_CFLAGS= -Wall -g `wx-config --cflags` +plugin_DefMimeHandler_GLOBAL_CFLAGS= ${CXXFLAGS} +plugin_DefMimeHandler_PROJECT_CFLAGS= -Wall `wx-config --cflags` plugin_DefMimeHandler_GLOBAL_LDFLAGS= plugin_DefMimeHandler_PROJECT_LDFLAGS= `wx-config --libs` plugin_DefMimeHandler_GLOBAL_INCS= -I/usr/include @@ -166,8 +166,8 @@ plugin_DefMimeHandler_PROJECT_LIBDIRS= -Lsdk/tinyxml plugin_DefMimeHandler_GLOBAL_LIBS= plugin_DefMimeHandler_PROJECT_LIBS= -plugin_PluginsWizard_GLOBAL_CFLAGS= -plugin_PluginsWizard_PROJECT_CFLAGS= -Wall -g `wx-config --cflags` +plugin_PluginsWizard_GLOBAL_CFLAGS= ${CXXFLAGS} +plugin_PluginsWizard_PROJECT_CFLAGS= -Wall `wx-config --cflags` plugin_PluginsWizard_GLOBAL_LDFLAGS= plugin_PluginsWizard_PROJECT_LDFLAGS= `wx-config --libs` plugin_PluginsWizard_GLOBAL_INCS= -I/usr/include @@ -176,8 +176,8 @@ plugin_PluginsWizard_PROJECT_LIBDIRS= -Lsdk/tinyxml plugin_PluginsWizard_GLOBAL_LIBS= plugin_PluginsWizard_PROJECT_LIBS= -plugin_ToDo_GLOBAL_CFLAGS= -plugin_ToDo_PROJECT_CFLAGS= -Wall -g `wx-config --cflags` +plugin_ToDo_GLOBAL_CFLAGS= ${CXXFLAGS} +plugin_ToDo_PROJECT_CFLAGS= -Wall `wx-config --cflags` plugin_ToDo_GLOBAL_LDFLAGS= plugin_ToDo_PROJECT_LDFLAGS= `wx-config --libs` plugin_ToDo_GLOBAL_INCS= -I/usr/include @@ -186,8 +186,8 @@ plugin_ToDo_PROJECT_LIBDIRS= -Lsdk/tinyxml plugin_ToDo_GLOBAL_LIBS= plugin_ToDo_PROJECT_LIBS= -plugin_XPManifest_GLOBAL_CFLAGS= -plugin_XPManifest_PROJECT_CFLAGS= -Wall -g `wx-config --cflags` +plugin_XPManifest_GLOBAL_CFLAGS= ${CXXFLAGS} +plugin_XPManifest_PROJECT_CFLAGS= -Wall `wx-config --cflags` plugin_XPManifest_GLOBAL_LDFLAGS= plugin_XPManifest_PROJECT_LDFLAGS= `wx-config --libs` plugin_XPManifest_GLOBAL_INCS= -I/usr/include @@ -196,8 +196,8 @@ plugin_XPManifest_PROJECT_LIBDIRS= -Lsdk/tinyxml plugin_XPManifest_GLOBAL_LIBS= plugin_XPManifest_PROJECT_LIBS= -update_GLOBAL_CFLAGS= -update_PROJECT_CFLAGS= -Wall -g `wx-config --cflags` +update_GLOBAL_CFLAGS= ${CXXFLAGS} +update_PROJECT_CFLAGS= -Wall `wx-config --cflags` update_GLOBAL_LDFLAGS= update_PROJECT_LDFLAGS= `wx-config --libs` update_GLOBAL_INCS= -I/usr/include @@ -206,8 +206,8 @@ update_PROJECT_LIBDIRS= -Lsdk/tinyxml update_GLOBAL_LIBS= update_PROJECT_LIBS= -console_runner_GLOBAL_CFLAGS= -console_runner_PROJECT_CFLAGS= -Wall -g `wx-config --cflags` +console_runner_GLOBAL_CFLAGS= ${CXXFLAGS} +console_runner_PROJECT_CFLAGS= -Wall `wx-config --cflags` console_runner_GLOBAL_LDFLAGS= console_runner_PROJECT_LDFLAGS= `wx-config --libs` console_runner_GLOBAL_INCS= -I/usr/include diff -Naur src.original/src/app.cpp src/src/app.cpp --- src.original/src/app.cpp 2005-08-05 12:04:38.000000000 -0500 +++ src/src/app.cpp 2005-08-05 12:07:06.000000000 -0500 @@ -88,7 +88,8 @@ SetAppName(APP_NAME" v"APP_VERSION); ConfigManager::Init(wxConfigBase::Get()); ConfigManager::Get()->Write("app_path", GetAppPath()); - ConfigManager::Get()->Write("data_path", GetAppPath() + "/share/CodeBlocks"); + ConfigManager::Get()->Write("data_path", "/usr/share/codeblocks"); + ConfigManager::Get()->Write("plugin_path", "/usr/lib/codeblocks"); m_HasDebugLog = ConfigManager::Get()->Read("/message_manager/has_debug_log", (long int)0) || m_HasDebugLog; ConfigManager::Get()->Write("/message_manager/has_debug_log", m_HasDebugLog); if (ParseCmdLine(0L) != 0) diff -Naur src.original/src/main.cpp src/src/main.cpp --- src.original/src/main.cpp 2005-08-05 12:04:38.000000000 -0500 +++ src/src/main.cpp 2005-08-05 12:08:42.000000000 -0500 @@ -412,7 +412,7 @@ if (forceShow || showAtStartup) { wxLogNull null; // disable error message if tips file does not exist - wxString tipsFile = ConfigManager::Get()->Read("/app_path") + "/tips.txt"; + wxString tipsFile = ConfigManager::Get()->Read("/data_path") + "/tips.txt"; long tipsIndex = ConfigManager::Get()->Read("/next_tip", (long)0); wxTipProvider* tipProvider = wxCreateFileTipProvider(tipsFile, tipsIndex); showAtStartup = wxShowTip(this, tipProvider, showAtStartup); @@ -620,7 +620,7 @@ PluginManager* m_PluginManager = Manager::Get()->GetPluginManager(); - wxString path = ConfigManager::Get()->Read("data_path") + "/plugins"; + wxString path = ConfigManager::Get()->Read("plugin_path") + "/plugins"; m_pMsgMan->Log(_("Scanning for plugins in %s..."), path.c_str()); int count = m_PluginManager->ScanForPlugins(path); m_pMsgMan->AppendLog(_("Found %d plugins: "), count);