summaryrefslogtreecommitdiffstats
path: root/src/msc.cpp
diff options
context:
space:
mode:
authorDimitri van Heesch <dimitri@stack.nl>2007-06-10 20:20:58 (GMT)
committerDimitri van Heesch <dimitri@stack.nl>2007-06-10 20:20:58 (GMT)
commit01147699a7fb267e9d9247bdfb640f46e2164d3a (patch)
tree7cff22f841dca9c505e2db2f685ece0fc7d95142 /src/msc.cpp
parent0b087b99d43fb3803b26407d771ca32e6cf5c34b (diff)
downloadDoxygen-01147699a7fb267e9d9247bdfb640f46e2164d3a.zip
Doxygen-01147699a7fb267e9d9247bdfb640f46e2164d3a.tar.gz
Doxygen-01147699a7fb267e9d9247bdfb640f46e2164d3a.tar.bz2
Release-1.5.2-20070610
Diffstat (limited to 'src/msc.cpp')
-rw-r--r--src/msc.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/msc.cpp b/src/msc.cpp
index aa4ad88..f68858a 100644
--- a/src/msc.cpp
+++ b/src/msc.cpp
@@ -98,7 +98,7 @@ void writeMscGraphFromFile(const char *inFile,const char *outDir,
// go to the html output directory (i.e. path)
QDir::setCurrent(outDir);
//printf("Going to dir %s\n",QDir::currentDirPath().data());
- QCString mscExe = Config_getString("MSC_PATH")+"mscgen"+portable_commandExtension();
+ QCString mscExe = Config_getString("MSCGEN_PATH")+"mscgen"+portable_commandExtension();
QCString mscArgs;
QCString extension;
if (format==MSC_BITMAP)
@@ -151,7 +151,7 @@ QString getMscImageMapFromFile(const QString& inFile, const QString& outDir,
QCString mscExe = "mscgen";
QCString mscArgs = "-T ismap -i \"";
mscArgs+=inFile + ".msc\" -o \"";
- mscArgs+=outFile + ".map\"";
+ mscArgs+=outFile + "\"";
int exitCode;
if ((exitCode=portable_system(mscExe,mscArgs,FALSE))!=0)
@@ -162,7 +162,7 @@ QString getMscImageMapFromFile(const QString& inFile, const QString& outDir,
QString result;
QTextOStream tmpout(&result);
- convertMapFile(tmpout, outFile+".map", relPath);
+ convertMapFile(tmpout, outFile, relPath);
QDir().remove(outFile);
QDir::setCurrent(oldDir);