summaryrefslogtreecommitdiffstats
path: root/kdoctools/meinproc.cpp
diff options
context:
space:
mode:
authorSlávek Banko <slavek.banko@axis.cz>2014-07-26 01:15:37 +0200
committerSlávek Banko <slavek.banko@axis.cz>2014-07-26 01:15:37 +0200
commit1bb6f88d298d1019c0c635dbff197a6a57d16c26 (patch)
treedfec2b4f48bb8fdb6aabf6fd6ccb9b42a20b1d2c /kdoctools/meinproc.cpp
parentc2c65a66955132f1e7310e2f62e9607efcc22a3e (diff)
downloadtdelibs-1bb6f88d298d1019c0c635dbff197a6a57d16c26.tar.gz
tdelibs-1bb6f88d298d1019c0c635dbff197a6a57d16c26.zip
Add docbook catalogs in xml format
Switch docbook catalogs to xml This resolves Bug 2077
Diffstat (limited to 'kdoctools/meinproc.cpp')
-rw-r--r--kdoctools/meinproc.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/kdoctools/meinproc.cpp b/kdoctools/meinproc.cpp
index 601f53f25..a63f1e185 100644
--- a/kdoctools/meinproc.cpp
+++ b/kdoctools/meinproc.cpp
@@ -153,11 +153,11 @@ int main(int argc, char **argv) {
}
TQString catalogs;
- catalogs += locate( "dtd", "customization/catalog" );
+ catalogs += locate( "dtd", "customization/catalog.xml" );
catalogs += " ";
- catalogs += locate( "dtd", "docbook/xml-dtd-4.1.2/docbook.cat" );
+ catalogs += locate( "dtd", "docbook/xml-dtd-4.1.2/catalog.xml" );
- setenv( "SGML_CATALOG_FILES", TQFile::encodeName( catalogs ).data(), 1);
+ setenv( "XML_CATALOG_FILES", TQFile::encodeName( catalogs ).data(), 1);
TQString exe;
#if defined( XMLLINT )
exe = XMLLINT;
@@ -170,7 +170,7 @@ int main(int argc, char **argv) {
if ( ::access( TQFile::encodeName( exe ), X_OK )==0 ) {
chdir( TQFile::encodeName( file.dirPath( true ) ) );
TQString cmd = exe;
- cmd += " --catalogs --valid --noout ";
+ cmd += " --valid --noout ";
cmd += TDEProcess::quote(file.fileName());
cmd += " 2>&1";
FILE *xmllint = popen( TQFile::encodeName( cmd ), "r");