--- kdevelop/setup/wizardkdedocpage.cpp 2003-01-14 01:41:20.000000000 +0100 +++ kdevelop/setup/wizardkdedocpage.cpp 2003-02-04 16:56:00.000000000 +0100 @@ -39,10 +39,8 @@ bool kde_docs_found=false; QStringList kde_dirs; - kde_dirs << "/opt/kde2/share/doc/HTML/en/kdelibs" // normal dist -//!? conflict with KDE-1.x << "/opt/kde/share/doc/HTML/en/kdelibs" // normal dist - << "/usr/share/doc/kdelibs" // Redhat 6.0 - << "/usr/local/kde/share/doc/kdelibs" // other locations + kde_dirs << "/usr/kde/3.1/share/doc/HTML/en/kdelibs-apidocs" + << "/usr/kde/3.2/share/doc/HTML/en/kdelibs-apidocs" << KDELIBS_DOCDIR; // autoconf said // first check the autoconfified path --- kdevelop/setup/ccreatedocdatabasedlg.cpp 2002-06-07 01:45:09.000000000 +0200 +++ kdevelop/setup/ccreatedocdatabasedlg.cpp 2003-02-04 17:32:26.000000000 +0100 @@ -192,7 +192,7 @@ void CCreateDocDatabaseDlg::slotOkClicked() { - if(!QFile::exists(m_kdeDocDir + "/kdeui/KDialog.html") && kde_checkbox->isChecked()){ + if(!QFile::exists(m_kdeDocDir + "/kdeui/html/classKDialog.html") && kde_checkbox->isChecked()){ KMessageBox::error(0,i18n("The KDE-Documentation-Path isn't set correctly."),i18n("No Database created!")); return; } --- kdevelop/setup/wizardcreatekdedocpage.cpp 2002-07-18 02:38:17.000000000 +0200 +++ kdevelop/setup/wizardcreatekdedocpage.cpp 2003-02-04 17:42:10.000000000 +0100 @@ -65,7 +65,7 @@ // kde_dir->mkdir(".kde/share/apps/kdevelop",false); // kde_dir->mkdir(".kde/share/apps/kdevelop/KDE-Documentation",false); - if(!QFile::exists(m_pInstallState->kde + "/kdeui/KDialog.html")) { + if(!QFile::exists(m_pInstallState->kde + "/kdeui/html/classKDialog.html")) { m_pInstallState->kde = docDir; } pDlg = new CUpdateKDEDocDlg(m_pInstallState->shell_process, docDir, m_pInstallState->qt, wdg, false, "test"); --- kdevelop/setup/ckdevinstall.cpp 2002-07-18 02:38:17.000000000 +0200 +++ kdevelop/setup/ckdevinstall.cpp 2003-02-04 17:43:36.000000000 +0100 @@ -62,7 +62,7 @@ m_config->setGroup("Doc_Location"); QString qtDocuPath = m_config->readEntry("doc_qt", QT_DOCDIR); QString kdeDocuPath = m_config->readEntry("doc_kde", KDELIBS_DOCDIR); - if(!QFile::exists(kdeDocuPath + "/kdeui/KDialog.html")) + if(!QFile::exists(kdeDocuPath + "/kdeui/html/classKDialog.html")) kdeDocuPath = KDELIBS_DOCDIR; m_pInstallState = new CKDevInstallState( qtDocuPath, kdeDocuPath); --- kdevelop/ctags/cctags_interf.h 2001-07-23 17:38:09.000000000 +0200 +++ kdevelop/ctags/cctags_interf.h 2003-02-04 17:55:57.000000000 +0100 @@ -31,7 +31,7 @@ public: CTagsCommandLine() { // long form of arguments m_onlyProjectFiles=false; - m_command = "ctags"; + m_command = "exuberant-ctags"; m_append = ""; //--append=no [default] m_sort = "-u"; //--sort=no m_totals = "--totals"; //--totals=yes --- kdevelop/ckdevelop_project.cpp 2002-06-25 16:59:59.000000000 +0200 +++ kdevelop/ckdevelop_project.cpp 2003-02-04 18:58:30.000000000 +0100 @@ -1356,7 +1356,7 @@ void CKDevelop::slotProjectMakeTags() { slotStatusMsg(i18n("Creating tags file...")); - if(!CToolClass::searchInstProgram("ctags")) // no dialog + if(!CToolClass::searchInstProgram("exuberant-ctags")) // no dialog { KMessageBox::sorry(0, i18n("KDevelop needs \"Exuberant Ctags\" \n for tags based search functionality."), --- kdevelop/setup/wizardtoolscheckpage.cpp 2002-07-18 02:38:17.000000000 +0200 +++ kdevelop/setup/wizardtoolscheckpage.cpp 2003-02-04 19:14:09.000000000 +0100 @@ -59,7 +59,7 @@ bool kpaint = CToolClass::searchInstProgram("kpaint"); bool designer = CToolClass::searchInstProgram("designer"); bool linguist = CToolClass::searchInstProgram("linguist"); - bool ctags = CToolClass::searchInstProgram("ctags"); + bool ctags = CToolClass::searchInstProgram("exuberant-ctags"); m_pInstallState->make = CToolClass::searchInstProgram("make"); m_pInstallState->gmake = CToolClass::searchInstProgram("gmake");