Fix help handbook, man page, and location of html doc files.

11 years ago · 7478ca6e14
parent c4ceb49bf4
commit 7478ca6e14
34 changed files with 6 additions and 3 deletions
--- a/data/Makefile.am
+++ b/data/Makefile.am
@ -0,0 +1 @@
+SUBDIRS = doc
--- a/data/doc/Makefile.am
+++ b/data/doc/Makefile.am
@ -0,0 +1,3 @@
+kdiff3dir = ${kde_datadir}/kdiff3/doc
+
+kdiff3_DATA = compilation.html credits.html dirmerge.html dirmergeoptions.html dirmergevisible.html documentation.html dothemerge.html faq.html features.html find.html index.html installation.html interpretinginformation.html introduction.html kpart.html merging.html misc.html navigation.html opendialog.html options.html other.html pasteinput.html preprocessors.html printing.html requirements.html saving.html screenshots.html selections.html startingdirmerge.html
--- a/data/doc/compilation.html
+++ b/data/doc/compilation.html
--- a/data/doc/credits.html
+++ b/data/doc/credits.html
--- a/data/doc/dirmerge.html
+++ b/data/doc/dirmerge.html
--- a/data/doc/dirmergeoptions.html
+++ b/data/doc/dirmergeoptions.html
--- a/data/doc/dirmergevisible.html
+++ b/data/doc/dirmergevisible.html
--- a/data/doc/documentation.html
+++ b/data/doc/documentation.html
--- a/data/doc/dothemerge.html
+++ b/data/doc/dothemerge.html
--- a/data/doc/faq.html
+++ b/data/doc/faq.html
--- a/data/doc/features.html
+++ b/data/doc/features.html
--- a/data/doc/find.html
+++ b/data/doc/find.html
--- a/data/doc/index.html
+++ b/data/doc/index.html
--- a/data/doc/installation.html
+++ b/data/doc/installation.html
--- a/data/doc/interpretinginformation.html
+++ b/data/doc/interpretinginformation.html
--- a/data/doc/introduction.html
+++ b/data/doc/introduction.html
--- a/data/doc/kpart.html
+++ b/data/doc/kpart.html
--- a/data/doc/merging.html
+++ b/data/doc/merging.html
--- a/data/doc/misc.html
+++ b/data/doc/misc.html
--- a/data/doc/navigation.html
+++ b/data/doc/navigation.html
--- a/data/doc/opendialog.html
+++ b/data/doc/opendialog.html
--- a/data/doc/options.html
+++ b/data/doc/options.html
--- a/data/doc/other.html
+++ b/data/doc/other.html
--- a/data/doc/pasteinput.html
+++ b/data/doc/pasteinput.html
--- a/data/doc/preprocessors.html
+++ b/data/doc/preprocessors.html
--- a/data/doc/printing.html
+++ b/data/doc/printing.html
--- a/data/doc/requirements.html
+++ b/data/doc/requirements.html
--- a/data/doc/saving.html
+++ b/data/doc/saving.html
--- a/data/doc/screenshots.html
+++ b/data/doc/screenshots.html
--- a/data/doc/selections.html
+++ b/data/doc/selections.html
--- a/data/doc/startingdirmerge.html
+++ b/data/doc/startingdirmerge.html
--- a/doc/en/Makefile.am
+++ b/doc/en/Makefile.am
@ -1,5 +1,2 @@
 KDE_DOCS = kdiff3
 KDE_LANG = en
-man1_MANS=kdiff3.1
-
-
--- a/man/Makefile.am
+++ b/man/Makefile.am
@ -0,0 +1,2 @@
+man_MANS = kdiff3.1
+EXTRA_DIST = $(man_MANS)
--- a/doc/en/kdiff3.1
+++ b/doc/en/kdiff3.1