Move all manpages into thier own man directory

9 files changed, 14 insertions, 11 deletions

diff --git a/Makefile.am b/Makefile.am
index e6e0cb3a..ef1b3704 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,5 +1,5 @@
-SUBDIRS = po libwindow-settings capplets font-viewer help
-DIST_SUBDIRS = po libwindow-settings capplets font-viewer help libslab shell typing-break
+SUBDIRS = po libwindow-settings capplets font-viewer help man
+DIST_SUBDIRS = po libwindow-settings capplets font-viewer help libslab shell typing-break man
 
 if HAVE_LIBMATESLAB
 SUBDIRS += libslab
diff --git a/capplets/about-me/Makefile.am b/capplets/about-me/Makefile.am
index 70525073..126dcdd4 100644
--- a/capplets/about-me/Makefile.am
+++ b/capplets/about-me/Makefile.am
@@ -41,8 +41,6 @@ desktop_DATA = $(Desktop_in_files:.desktop.in=.desktop)
 uidir   = $(pkgdatadir)/ui
 ui_DATA = $(ui_files)
 
-man_MANS = mate-about-me.1
-
 AM_CPPFLAGS = \
 	$(MATECC_CAPPLETS_CFLAGS) \
 	$(LIBEBOOK_CFLAGS) \
@@ -53,6 +51,6 @@ AM_CPPFLAGS = \
 	-DMATELOCALEDIR="\"$(datadir)/locale\""
 
 CLEANFILES = $(MATECC_CAPPLETS_CLEANFILES) $(desktop_DATA) $(MARSHALFILES)
-EXTRA_DIST = $(ui_files) $(man_MANS) fprintd-marshal.list
+EXTRA_DIST = $(ui_files) fprintd-marshal.list
 
 -include $(top_srcdir)/git.mk
diff --git a/capplets/appearance/data/Makefile.am b/capplets/appearance/data/Makefile.am
index 73785a2d..72ace798 100644
--- a/capplets/appearance/data/Makefile.am
+++ b/capplets/appearance/data/Makefile.am
@@ -53,9 +53,7 @@ if ENABLE_UPDATE_MIMEDB
 	$(UPDATE_MIME_DATABASE) "$(DESTDIR)$(datadir)/mime"
 endif
 
-man_MANS = mate-appearance-properties.1
-
-EXTRA_DIST = $(xml_in_files) $(man_MANS)
+EXTRA_DIST = $(xml_in_files)
 
 
 CLEANFILES = $(desktop_in_files) $(desktop_DATA) $(mime_DATA)
diff --git a/capplets/default-applications/Makefile.am b/capplets/default-applications/Makefile.am
index 9a58bbfc..96d979c2 100644
--- a/capplets/default-applications/Makefile.am
+++ b/capplets/default-applications/Makefile.am
@@ -3,8 +3,6 @@ cappletname = mate-default-applications-properties
 
 bin_PROGRAMS = mate-default-applications-properties
 
-man_MANS = mate-default-applications-properties.1
-
 mate_default_applications_properties_LDADD = $(MATECC_CAPPLETS_LIBS)
 mate_default_applications_properties_SOURCES = \
 	mate-da-capplet.c mate-da-capplet.h
@@ -29,6 +27,6 @@ AM_CPPFLAGS = \
 	-DMATECC_UI_DIR=\""$(uidir)"\"
 
 CLEANFILES = $(MATECC_CAPPLETS_CLEANFILES) $(Desktop_in_files) $(desktop_DATA) $(autostart_DATA)
-EXTRA_DIST = mate-default-applications.pc.in mate-default-applications-properties.desktop.in.in $(man_MANS)
+EXTRA_DIST = mate-default-applications.pc.in mate-default-applications-properties.desktop.in.in
 
 -include $(top_srcdir)/git.mk
diff --git a/configure.ac b/configure.ac
index 828ea008..71787aff 100644
--- a/configure.ac
+++ b/configure.ac
@@ -370,6 +370,7 @@ font-viewer/mate-font-viewer.desktop.in
 help/Makefile
 libwindow-settings/Makefile
 libwindow-settings/mate-window-settings-2.0.pc
+man/Makefile
 po/Makefile.in
 libslab/mate-slab.pc
 libslab/Makefile
diff --git a/man/Makefile.am b/man/Makefile.am
new file mode 100644
index 00000000..2baee6a0
--- /dev/null
+++ b/man/Makefile.am
@@ -0,0 +1,8 @@
+man_MANS = \
+    mate-about-me.1 \
+    mate-appearance-properties.1 \
+    mate-default-applications-properties.1
+
+EXTRA_DIST = $(man_MANS)
+
+-include $(top_srcdir)/git.mk
diff --git a/capplets/about-me/mate-about-me.1 b/man/mate-about-me.1
index e6be7655..e6be7655 100644
--- a/capplets/about-me/mate-about-me.1
+++ b/man/mate-about-me.1
diff --git a/capplets/appearance/data/mate-appearance-properties.1 b/man/mate-appearance-properties.1
index 0c1dddfd..0c1dddfd 100644
--- a/capplets/appearance/data/mate-appearance-properties.1
+++ b/man/mate-appearance-properties.1
diff --git a/capplets/default-applications/mate-default-applications-properties.1 b/man/mate-default-applications-properties.1
index 4575a34f..4575a34f 100644
--- a/capplets/default-applications/mate-default-applications-properties.1
+++ b/man/mate-default-applications-properties.1