Move the tdelirc manuals to the directory level in which they are installed.

The manual for the tdelirc control center module is moved to KControl.

Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
(cherry picked from commit b243598f2e3fe773f652207d97f85744d73d5290)

11 files changed, 9 insertions, 27 deletions

diff --git a/doc/tdelirc/irkick/CMakeLists.txt b/doc/irkick/CMakeLists.txt
index e48e649..e48e649 100644
--- a/doc/tdelirc/irkick/CMakeLists.txt
+++ b/doc/irkick/CMakeLists.txt
diff --git a/doc/tdelirc/irkick/Makefile.am b/doc/irkick/Makefile.am
index 085981d..085981d 100644
--- a/doc/tdelirc/irkick/Makefile.am
+++ b/doc/irkick/Makefile.am
diff --git a/doc/tdelirc/irkick/index.docbook b/doc/irkick/index.docbook
index e32d246..e32d246 100644
--- a/doc/tdelirc/irkick/index.docbook
+++ b/doc/irkick/index.docbook
diff --git a/doc/tdelirc/CMakeLists.txt b/doc/kcontrol/kcmlirc/CMakeLists.txt
index dc6bb77..6357971 100644
--- a/doc/tdelirc/CMakeLists.txt
+++ b/doc/kcontrol/kcmlirc/CMakeLists.txt
@@ -9,4 +9,4 @@
 #
 #################################################
 
-tde_auto_add_subdirectories( )
+tde_create_handbook( DESTINATION kcontrol/kcmlirc )
diff --git a/doc/kcontrol/kcmlirc/Makefile.am b/doc/kcontrol/kcmlirc/Makefile.am
new file mode 100644
index 0000000..fcd9c72
--- /dev/null
+++ b/doc/kcontrol/kcmlirc/Makefile.am
@@ -0,0 +1,3 @@
+
+KDE_LANG = en
+KDE_DOCS = kcontrol/kcmlirc
diff --git a/doc/tdelirc/kcmlirc/index.docbook b/doc/kcontrol/kcmlirc/index.docbook
index d134d7a..f712cf9 100644
--- a/doc/tdelirc/kcmlirc/index.docbook
+++ b/doc/kcontrol/kcmlirc/index.docbook
@@ -38,6 +38,7 @@ Infrared Remote Control functionality.</para></abstract>
 
 <keywordset>
 <keyword>TDE</keyword>
+<keyword>KControl</keyword>
 <keyword>irkick</keyword>
 <keyword>tdelirc</keyword>
 <keyword>kcmlirc</keyword>
diff --git a/doc/tdelirc/Makefile.am b/doc/tdelirc/Makefile.am
deleted file mode 100644
index 6812bd2..0000000
--- a/doc/tdelirc/Makefile.am
+++ /dev/null
@@ -1,5 +0,0 @@
-
-KDE_LANG = en
-KDE_DOCS = AUTO
-SUBDIRS = $(AUTODIRS)
-
diff --git a/doc/tdelirc/kcmlirc/CMakeLists.txt b/doc/tdelirc/kcmlirc/CMakeLists.txt
deleted file mode 100644
index 7414552..0000000
--- a/doc/tdelirc/kcmlirc/CMakeLists.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-#################################################
-#
-#  (C) 2012 Golubev Alexander
-#  fatzer2 (AT) gmail.com
-#
-#  Improvements and feedback are welcome
-#
-#  This file is released under GPL >= 2
-#
-#################################################
-
-tde_create_handbook( DESTINATION kcmlirc )
-
diff --git a/doc/tdelirc/kcmlirc/Makefile.am b/doc/tdelirc/kcmlirc/Makefile.am
deleted file mode 100644
index 085981d..0000000
--- a/doc/tdelirc/kcmlirc/Makefile.am
+++ /dev/null
@@ -1,4 +0,0 @@
-
-KDE_LANG = en
-KDE_DOCS = AUTO
-
diff --git a/tdelirc/kcmlirc/kcmlirc.cpp b/tdelirc/kcmlirc/kcmlirc.cpp
index e1f35e3..512d10d 100644
--- a/tdelirc/kcmlirc/kcmlirc.cpp
+++ b/tdelirc/kcmlirc/kcmlirc.cpp
@@ -530,9 +530,9 @@ TQString KCMLirc::handbookDocPath() const
 {
  	int index = theKCMLircBase->tabWidget2->currentPageIndex();
  	if (index == 0)
-		return "kcmlirc/usage.html";
+		return "kcontrol/kcmlirc/usage.html";
 	else if (index == 1)
-		return "kcmlirc/extensions.html";
+		return "kcontrol/kcmlirc/extensions.html";
  	else
  		return TQString::null;
 }
diff --git a/tdelirc/kcmlirc/kcmlirc.desktop b/tdelirc/kcmlirc/kcmlirc.desktop
index cc5240d..90d2697 100644
--- a/tdelirc/kcmlirc/kcmlirc.desktop
+++ b/tdelirc/kcmlirc/kcmlirc.desktop
@@ -11,6 +11,6 @@ Terminal=false
 Type=Application
 X-TDE-FactoryName=kcmlirc
 X-TDE-Library=kcmlirc
-X-TDE-ModuleType=Library
-X-DocPath=kcmlirc/index.html
+X-TDE-ParentApp=kcontrol
+X-DocPath=kcontrol/kcmlirc/index.html
 Categories=Qt;TDE;X-TDE-settings-peripherals;