Minor updates to debug output

timlinux · timlinux · commit cafdaebc6a02 · 2006-09-12T23:32:42.000Z
Try to do a better job of deploying .py files on mac git-svn-id: http://svn.osgeo.org/qgis/trunk@5816 c8812cc2-4d05-0410-92ff-de0c093fc19c
diff --git a/tools/mapserver_export/Makefile.am b/tools/mapserver_export/Makefile.am
@@ -88,8 +88,10 @@ endif
 #
 # Put script into an appropriate dir
 #
-
 pythondir = ${pkgdatadir}/python
+if HAVE_QTMAC
+	pythondir=$(MACBINDIR)/share/qgis/python
+endif
 
 python_DATA = *.py
 
diff --git a/tools/mapserver_export/qgsmapserverexport.cpp b/tools/mapserver_export/qgsmapserverexport.cpp
@@ -118,7 +118,7 @@ void QgsMapserverExport::on_buttonOk_clicked()
 #endif
   dataPath = dataPath.trimmed();
   QString scriptDir = dataPath + QDir::separator() + "python";
-  qDebug(scriptDir);
+  qDebug("Python scripts directory: " + scriptDir.toLocal8Bit());
   //QString curdir = "/home/gsherman/development/qgis_qt_port/tools/mapserver_export";
   QString sysCmd = QString("sys.path.append('%1')").arg(scriptDir);
   PyRun_SimpleString(sysCmd.ascii());

Original file line number	Diff line number	Diff line change
`@@ -88,8 +88,10 @@ endif`
`88`	`88`	`#`
`89`	`89`	`# Put script into an appropriate dir`
`90`	`90`	`#`
`91`		`-`
`92`	`91`	`pythondir = ${pkgdatadir}/python`
	`92`	`+if HAVE_QTMAC`
	`93`	`+ pythondir=$(MACBINDIR)/share/qgis/python`
	`94`	`+endif`
`93`	`95`
`94`	`96`	`python_DATA = *.py`
`95`	`97`