From 30a64aa8da492ada95aff171b745e7b50145f643 Mon Sep 17 00:00:00 2001 From: "Tim E. Real" Date: Sun, 24 Oct 2010 08:21:08 +0000 Subject: See ChangeLog --- muse2/muse/app.cpp | 23 ++++++++++++++++------- 1 file changed, 16 insertions(+), 7 deletions(-) (limited to 'muse2/muse/app.cpp') diff --git a/muse2/muse/app.cpp b/muse2/muse/app.cpp index a4df0d3f..4a3d79a3 100644 --- a/muse2/muse/app.cpp +++ b/muse2/muse/app.cpp @@ -3227,17 +3227,26 @@ int main(int argc, char* argv[]) museGlobal = p; if (museGlobal.isEmpty()) { - QString museGlobal(INSTPREFIX); - QString museGlobalLibDir(INSTLIBDIR); - + //QString museGlobal(INSTPREFIX); + //QString museGlobalLibDir(INSTLIBDIR); + //QString museGlobalLibDir(LIBINSTPREFIX); // This has no prefix. //museGlobalLib = museGlobalLibDir + "/muse"; //museGlobalShare = museGlobal + "/share/muse"; - museGlobalLib = museGlobalLibDir + QString("/") + QString(INSTALL_NAME); // p4.0.2 - museGlobalShare = museGlobal + QString("/share/") + QString(INSTALL_NAME); // + + // p4.0.7 + museGlobalLib = QString(INSTPREFIX) + QString("/") + + QString(LIBINSTPREFIX) + QString("/") + + QString(INSTALL_NAME); + //museGlobalShare = museGlobal + QString("/share/") + QString(INSTALL_NAME); + museGlobalShare = QString(INSTPREFIX) + QString("/") + + QString(SHAREINSTPREFIX) + QString("/") + // This has no prefix. Default is "share", set in top cmake script. + QString(INSTALL_NAME); } else { - museGlobalLib = museGlobal + "/lib"; - museGlobalShare = museGlobal + "/share"; + //museGlobalLib = museGlobal + "/lib"; + //museGlobalShare = museGlobal + "/share"; + museGlobalLib = museGlobal + QString("/") + QString(LIBINSTPREFIX); // p4.0.7 + museGlobalShare = museGlobal + QString("/") + QString(SHAREINSTPREFIX); } museProject = museProjectInitPath; //getcwd(0, 0); configName = QString(getenv("HOME")) + QString("/.MusE"); -- cgit v1.2.3