[QTerm-cvs] SF.net SVN: qterm:[952] trunk/qterm-qt4

[<hep...@us...>]

Revision: 952
          http://qterm.svn.sourceforge.net/qterm/?rev=952&view=rev
Author:   hephooey
Date:     2009-06-20 18:55:44 +0000 (Sat, 20 Jun 2009)

Log Message:
-----------
Do not hard code the path

Modified Paths:
--------------
    trunk/qterm-qt4/CMakeLists.txt
    trunk/qterm-qt4/config.h.cmake
    trunk/qterm-qt4/src/qterm.h
    trunk/qterm-qt4/src/qtermglobal.cpp

Modified: trunk/qterm-qt4/CMakeLists.txt
===================================================================
--- trunk/qterm-qt4/CMakeLists.txt	2009-06-20 04:32:29 UTC (rev 951)
+++ trunk/qterm-qt4/CMakeLists.txt	2009-06-20 18:55:44 UTC (rev 952)
@@ -8,6 +8,4 @@
 find_package(Qt4 REQUIRED)
 find_package(KDE4)
 add_subdirectory(src)
-set(QTERM_BINDIR "${CMAKE_INSTALL_PREFIX}/bin")
-set(QTERM_DATADIR "${CMAKE_INSTALL_PREFIX}/share/qterm")
 configure_file(${CMAKE_CURRENT_SOURCE_DIR}/config.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config.h)

Modified: trunk/qterm-qt4/config.h.cmake
===================================================================
--- trunk/qterm-qt4/config.h.cmake	2009-06-20 04:32:29 UTC (rev 951)
+++ trunk/qterm-qt4/config.h.cmake	2009-06-20 18:55:44 UTC (rev 952)
@@ -1,3 +1 @@
 #define QTERM_VERSION "${QTERM_VERSION}"
-#define QTERM_BINDIR "${QTERM_BINDIR}"
-#define QTERM_DATADIR "${QTERM_DATADIR}"

Modified: trunk/qterm-qt4/src/qterm.h
===================================================================
--- trunk/qterm-qt4/src/qterm.h	2009-06-20 04:32:29 UTC (rev 951)
+++ trunk/qterm-qt4/src/qterm.h	2009-06-20 18:55:44 UTC (rev 952)
@@ -17,9 +17,7 @@
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #else
-#define QTERM_VERSION	"0.4.0pre3"
-#define QTERM_DATADIR "/usr/share/qterm"
-#define QTERM_BINDIR  "/usr/bin"
+#define QTERM_VERSION   "0.5.6"
 #endif
 
 #ifndef BUFSIZE

Modified: trunk/qterm-qt4/src/qtermglobal.cpp
===================================================================
--- trunk/qterm-qt4/src/qtermglobal.cpp	2009-06-20 04:32:29 UTC (rev 951)
+++ trunk/qterm-qt4/src/qtermglobal.cpp	2009-06-20 18:55:44 UTC (rev 952)
@@ -490,13 +490,16 @@
     fi.setFile(param);
     m_pathLib = fi.path() + '/';
 #else
+    QString prefix = QCoreApplication::applicationDirPath();
+    prefix.chop(3); // "bin"
+    qDebug() << prefix;
     m_pathCfg = QDir::homePath() + "/.qterm/";
     if (!isPathExist(m_pathCfg))
         return false;
 
     // pathLib --- where datedir "pic", "cursor", "po"
     if (param.indexOf('/') == -1)
-        m_pathLib = QTERM_DATADIR"/";
+        m_pathLib = prefix + "share/qterm/";
     else {
         QFileInfo fi(param);
         if (fi.isSymLink())
@@ -505,9 +508,9 @@
         param.truncate(param.lastIndexOf('/'));
         QString oldPath = QDir::currentPath();
         QDir::setCurrent(param);
-        dir.setPath(QTERM_BINDIR);
+        dir.setPath(QCoreApplication::applicationDirPath());
         if (dir == QDir::current())
-            m_pathLib = QTERM_DATADIR;
+            m_pathLib = prefix + "share/qterm/";
         else
             m_pathLib = QDir::currentPath();
         QDir::setCurrent(oldPath);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.