4 files changed, 13 insertions, 25 deletions
diff --git a/hw/xnest/.gitignore b/hw/xnest/.gitignore
index 16db15e20..b76c5a2d0 100644
--- a/hw/xnest/.gitignore
+++ b/hw/xnest/.gitignore
@@ -1,3 +1 @@
-#		Add & Override for this directory and it's subdirectories
 Xnest
-Xnest.man
diff --git a/hw/xnest/Makefile.am b/hw/xnest/Makefile.am
index 666a0f0e6..c395b4dae 100644
--- a/hw/xnest/Makefile.am
+++ b/hw/xnest/Makefile.am
@@ -1,3 +1,5 @@
+SUBDIRS = man
+
 bin_PROGRAMS = Xnest
 noinst_LIBRARIES = libfbcmap.a
 
@@ -59,34 +61,12 @@ Xnest_LDADD = $(XNEST_LIBS) $(XNEST_SYS_LIBS) $(XSERVER_SYS_LIBS)
 Xnest_LDFLAGS = $(LD_EXPORT_SYMBOLS_FLAG)
 
 EXTRA_DIST = icon \
-             screensaver \
-	     Xnest.man.pre
+             screensaver
 
 # -UDPMSExtension for miinitext? can't put into 
 # OS_DEFINES???
 # EXT_DEFINES???
 # ICONFIGFILES -- SpecialCObjectRule
 
-# Man page
-include $(top_srcdir)/cpprules.in
-
-appmandir = $(APP_MAN_DIR)
-
-appman_PRE = Xnest.man
-appman_DATA = $(appman_PRE:man=@APP_MAN_SUFFIX@)
-
-EXTRAMANDEFS = \
-	-D__XCONFIGFILE__=$(__XCONFIGFILE__) \
-	-D__XSERVERNAME__=$(XSERVERNAME)
-
-BUILT_SOURCES = $(appman_PRE)
-CLEANFILES = $(appman_PRE) $(appman_DATA)
-
-SUFFIXES += .$(APP_MAN_SUFFIX) .man
-
-.man.$(APP_MAN_SUFFIX):
-	-$(AM_V_at)rm -f $@
-	$(AM_V_at)$(LN_S) $< $@
-
 relink:
 	$(AM_V_at)rm -f Xnest$(EXEEXT) && $(MAKE) Xnest$(EXEEXT)
diff --git a/hw/xnest/man/Makefile.am b/hw/xnest/man/Makefile.am
new file mode 100644
index 000000000..ff3468f59
--- /dev/null
+++ b/hw/xnest/man/Makefile.am
@@ -0,0 +1,10 @@
+appmandir = $(APP_MAN_DIR)
+appman_PRE = Xnest.man
+appman_DATA = $(appman_PRE:man=$(APP_MAN_SUFFIX))
+
+EXTRA_DIST = $(appman_PRE)
+CLEANFILES = $(appman_DATA)
+SUFFIXES = .$(APP_MAN_SUFFIX) .man
+
+.man.$(APP_MAN_SUFFIX):
+	$(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@
diff --git a/hw/xnest/Xnest.man.pre b/hw/xnest/man/Xnest.man
index 024d88e82..024d88e82 100644
--- a/hw/xnest/Xnest.man.pre
+++ b/hw/xnest/man/Xnest.man