Blob Blame History Raw
--- ParaView3.2.1/Applications/Client/CMakeLists.txt.doc	2007-11-20 09:14:25.000000000 -0700
+++ ParaView3.2.1/Applications/Client/CMakeLists.txt	2007-11-30 16:37:26.000000000 -0700
@@ -134,7 +134,7 @@
 EXEC_PROGRAM(${QT_QMAKE_EXECUTABLE} ARGS "-query QT_INSTALL_BINS"
              OUTPUT_VARIABLE PV_ASSISTANT)
 FILE(TO_NATIVE_PATH "${PV_ASSISTANT}/" PV_ASSISTANT)
-FILE(TO_NATIVE_PATH "${ParaView_BINARY_DIR}/pqClient.adp" PV_CLIENT_DOC)
+FILE(TO_NATIVE_PATH "/usr/share/paraview/pqClient.adp" PV_CLIENT_DOC)
 
 CONFIGURE_FILE("${CMAKE_CURRENT_SOURCE_DIR}/pqClientDocFinder.txt.in"
                "${EXECUTABLE_OUTPUT_PATH}/pqClientDocFinder.txt"
--- ParaView3.2.1/Documentation/CMakeLists.txt.doc	2007-11-07 13:51:40.000000000 -0700
+++ ParaView3.2.1/Documentation/CMakeLists.txt	2007-12-05 11:59:09.000000000 -0700
@@ -149,9 +149,9 @@
 
 set(dir "${ParaView_BINARY_DIR}/Documentation/")
 install(DIRECTORY ${ParaView_BINARY_DIR}/Documentation/ 
-        DESTINATION ${PV_EXE_INSTALL_CM24}/Documentation 
+        DESTINATION /usr/share/paraview/Documentation 
         COMPONENT Runtime
         REGEX ".html")
 
 install(FILES ${ParaView_BINARY_DIR}/pqClient.adp 
-  DESTINATION ${PV_EXE_INSTALL_CM24} COMPONENT Runtime )
+  DESTINATION /usr/share/paraview COMPONENT Runtime )
--- ParaView3.2.1/Applications/Client/MainWindow.cxx.doc	2007-12-05 20:55:45.000000000 -0700
+++ ParaView3.2.1/Applications/Client/MainWindow.cxx	2007-12-05 20:57:35.000000000 -0700
@@ -947,17 +947,7 @@
   QStringList args;
   args.append(QString("-profile"));
 
-  if(profileFile.isEmpty())
-    {
-    // see if help is bundled up with the application
-    QString profile = ::Locate("pqClient.adp");
-      /*QCoreApplication::applicationDirPath() + QDir::separator()
-      + QString("pqClient.adp");*/
-    if(QFile::exists(profile))
-      {
-      profileFile = profile;
-      }
-    }
+  profileFile = QString("/usr/share/paraview/pqClient.adp");
 
   if(profileFile.isEmpty() && getenv("PARAVIEW_HELP"))
     {