4 files changed, 17 insertions, 15 deletions
diff --git a/Makefile.am b/Makefile.am
index f02ea7f..fc7a74c 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -19,6 +19,7 @@
 #  TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 #  PERFORMANCE OF THIS SOFTWARE.
 
+SUBDIRS = man
 bin_PROGRAMS = xedit
 noinst_LIBRARIES = liblisp.a libre.a libmp.a
 noinst_PROGRAMS = lisp/lsp lisp/re/tests
@@ -184,7 +185,6 @@ dist_progmodes_DATA = \
 	${srcdir}/lisp/modules/progmodes/xlog.lsp \
 	${srcdir}/lisp/modules/progmodes/xrdb.lsp
 
-appman_PRE = xedit.man
 
 EXTRA_DIST = \
 	app-defaults/Xedit-color \
@@ -211,20 +211,7 @@ EXTRA_DIST = \
 	lisp/test/stream.lsp \
 	lisp/test/widgets.lsp
 
-appmandir = $(APP_MAN_DIR)
-
-appman_DATA = $(appman_PRE:man=@APP_MAN_SUFFIX@)
-
-EXTRA_DIST += $(appman_PRE)
 MAINTAINERCLEANFILES = ChangeLog INSTALL
-CLEANFILES = $(appman_DATA)
-
-SUFFIXES = .$(APP_MAN_SUFFIX) .man
-
-# String replacements in MAN_SUBSTS now come from xorg-macros.m4 via configure
-.man.$(APP_MAN_SUFFIX):
-	$(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@
-
 
 .PHONY: ChangeLog INSTALL
 
diff --git a/configure.ac b/configure.ac
index 2a7b6f2..21c6696 100644
--- a/configure.ac
+++ b/configure.ac
@@ -64,4 +64,7 @@ AC_ARG_WITH(appdefaultdir,
 AC_SUBST(appdefaultdir)
 
 
-AC_OUTPUT([Makefile])
+AC_CONFIG_FILES([
+	Makefile
+	man/Makefile])
+AC_OUTPUT
diff --git a/man/Makefile.am b/man/Makefile.am
new file mode 100644
index 0000000..6799ec5
--- /dev/null
+++ b/man/Makefile.am
@@ -0,0 +1,12 @@
+
+appmandir = $(APP_MAN_DIR)
+appman_PRE = xedit.man
+appman_DATA = $(appman_PRE:man=$(APP_MAN_SUFFIX))
+
+EXTRA_DIST = $(appman_PRE)
+CLEANFILES = $(appman_DATA)
+SUFFIXES = .$(APP_MAN_SUFFIX) .man
+
+# String replacements in MAN_SUBSTS now come from xorg-macros.m4 via configure
+.man.$(APP_MAN_SUFFIX):
+	$(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@
diff --git a/xedit.man b/man/xedit.man
index cd40ad5..cd40ad5 100644
--- a/xedit.man
+++ b/man/xedit.man