5 files changed, 20 insertions, 36 deletions
diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt
deleted file mode 100644
index 314d65c..0000000
--- a/doc/CMakeLists.txt
+++ /dev/null
@@ -1,17 +0,0 @@
-INCLUDE_DIRECTORIES( ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR})
-
-# Macro defined in FindMEINPROC.cmake handles building and installing
-ADD_DOCS(kmymoney2 en)
-
-# Manpages we have to handle manually
-SET(_in ${CMAKE_CURRENT_SOURCE_DIR}/en/kmymoney2.1)
-SET(_out ${CMAKE_CURRENT_BINARY_DIR}/kmymoney2.1.gz)
-
-ADD_CUSTOM_COMMAND(OUTPUT ${_out}
-  COMMAND gzip
-  ARGS -9 -c -N ${_in} > ${_out}
-  DEPENDS ${_in})
-INSTALL(FILES ${_out}
-  DESTINATION ${MAN_INSTALL_DIR}/man1)
-ADD_CUSTOM_TARGET(manpages ALL DEPENDS ${_out})
-ADD_DEPENDENCIES(documentation manpages)
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 9f56c25..723d192 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -1,6 +1,6 @@
 ####### tdevelop will overwrite this part!!! (begin)##########
 
-SUBDIRS = en
+SUBDIRS = en man
 
 ####### tdevelop will overwrite this part!!! (end)############
 
diff --git a/doc/en/Makefile.am b/doc/en/Makefile.am
index be4fb00..46b40f0 100644
--- a/doc/en/Makefile.am
+++ b/doc/en/Makefile.am
@@ -4,11 +4,11 @@ DOCBOOK_FILES = credits.docbook details-accounts.docbook  details-categories.doc
 
 SCREENSHOT_FILES = accountdropdown.png accounts_view.png newacct.png accwiz1.png accwiz2.png accwiz3.png accwiz4.png accwiz5.png accwiz6.png accwiz7.png accwiz8.1.png accwiz8.2.png accwiz8.3.png accwiz8.4.png accwiz8.5.png accwiz9.png accwiz10.png calendarview.png categories.png categories_view.png categoryedit.png confirmenter.png default_prompt.png enterschedule.png finddlg.png home_view.png institutions_view.png investments_view.png kmt.png ledgers.png ledgers_view.png ledgerview-numbered.png mainwindow_numbered.png newfile.png newinst.png new.png newsched_numbered.png outbox_view.png payees_view.png payeeview.png qifopen.png reconcile.png reports_view.png schedcaltypes.png schedpopup.png schedule_view.png scheduleview.png tipofday.png transaction_find.png transactionform.png translist.png schedmonthday.png find-account.png find-amount.png find-category.png find-date.png find-details.png find-payee.png find-text.png payee_widget.png category_widget.png value_widget.png date_widget.png institution_view.png institution_options.png account_options.png account_edit.png payee_info.png payee_match.png payee_history.png split_transaction.png cleared_state.png transactionform-off.png ledger_more.png select_currency.png reconcile1.png reconcile2.png reconcile3.png reconcile4.png qif_report.png qifimportverify.png investment-transactionform.png investment-onlineupdate.png investment-currencywarning.png investment-exchangerateeditor.png gnucash-import_options.png gnucash-report.png gnucash-select_price_source.png  currency_newpriceentry.png currency_priceeditor.png investments_summarytab.png qifimport-export.png qifimport-qifprofiledate.png qifimport-qifprofileeditor.png report_configuration-reporttab.png report_configuration-rowscolumns.png reports_view-all.png select_database.png budgets_view.png forecast_view.png newfile-2.png newfile-3.png newfile-4.png newfile-5.png newfile-6.png
 
-EXTRA_DIST = kmymoney2.1 $(DOCBOOK_FILES)
+EXTRA_DIST = $(DOCBOOK_FILES)
 
-MOSTLYCLEANFILES = index.cache.bz2 kmymoney2.1.gz index.xml *.aux *.tex *.log **.out *.pdf errorlog *.ps *.html online-manual.tar.bz2
+MOSTLYCLEANFILES = index.cache.bz2 index.xml *.aux *.tex *.log **.out *.pdf errorlog *.ps *.html online-manual.tar.bz2
 
-BUILT_SOURCES = index.cache.bz2 kmymoney2.1.gz $(PDF_TARGET)
+BUILT_SOURCES = index.cache.bz2 $(PDF_TARGET)
 
 CHARSET = 
 KDE_LANG = en
@@ -119,24 +119,11 @@ kmymoney-user.pdf: $(DOCBOOK_FILES) $(SCREENSHOT_FILES)
 endif
 
 
-
-
 # The automatic KDE install installs some files,
 # that we don't need, so we remove them immediately.
 # Also install the man pages on this system
 .PHONY: install-docs uninstall-docs
 
-install-data-hook: kmymoney2.1.gz install-docs
-	-rm -f $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kmymoney2/kmymoney2.1
-	$(mkinstalldirs) $(DESTDIR)$(mandir)/man1/
-	$(INSTALL_DATA) kmymoney2.1.gz $(DESTDIR)$(mandir)/man1/kmymoney2.1.gz
-
-kmymoney2.1.gz: kmymoney2.1
-	gzip -9 -c -N $(top_srcdir)/$(subdir)/kmymoney2.1 > kmymoney2.1.gz
-
-uninstall-hook: uninstall-docs
-	-rm -f $(DESTDIR)$(mandir)/man1/kmymoney2.1.gz
-
 #
 # The following two rules are copied from an 'am_edit' generated
 # version. Since we do not use the automatic generated version to
@@ -156,5 +143,3 @@ install-docs:
 
 uninstall-docs:
 	-rm -rf $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kmymoney2
-
-
diff --git a/doc/man/Makefile.am b/doc/man/Makefile.am
new file mode 100644
index 0000000..4a80bb4
--- /dev/null
+++ b/doc/man/Makefile.am
@@ -0,0 +1,16 @@
+EXTRA_DIST = kmymoney2.1
+
+MOSTLYCLEANFILES = kmymoney2.1.gz
+
+BUILT_SOURCES = kmymoney2.1.gz
+
+install-data-hook: kmymoney2.1.gz
+	-rm -f $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kmymoney2/kmymoney2.1
+	$(mkinstalldirs) $(DESTDIR)$(mandir)/man1/
+	$(INSTALL_DATA) kmymoney2.1.gz $(DESTDIR)$(mandir)/man1/kmymoney2.1.gz
+
+kmymoney2.1.gz: kmymoney2.1
+	gzip -9 -c -N $(top_srcdir)/$(subdir)/kmymoney2.1 > kmymoney2.1.gz
+
+uninstall-hook:
+	-rm -f $(DESTDIR)$(mandir)/man1/kmymoney2.1.gz
diff --git a/doc/en/kmymoney2.1 b/doc/man/kmymoney2.1
index 6741c34..6741c34 100644
--- a/doc/en/kmymoney2.1
+++ b/doc/man/kmymoney2.1