X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/tripe/blobdiff_plain/388e0319a0faf48193658c82228133bd1ea24eb6..9df937a3260f29c61ff955104f22e3f7f94ca85c:/vars.am

diff --git a/vars.am b/vars.am
index 6eb59dbf..245b98e7 100644
--- a/vars.am
+++ b/vars.am
@@ -78,21 +78,14 @@ SUFFIXES		+= .5 .5.in
 SUFFIXES		+= .7 .7.in
 SUFFIXES		+= .8 .8.in
 
-mandefs = $(top_builddir)/defs.man
-
-mansubst = sed \
-	-e '/@@@PRE@@@/ {' \
-	-e   'r$(mandefs)' \
-	-e   'd' \
-	-e '}'
-
-.1.in.1 .5.in.5 .7.in.7 .8.in.8: $(mandefs)
-	$(mansubst) $< >$@.new && mv $@.new $@
-
-$(mandefs): $(top_srcdir)/defs.man.in Makefile
-	$(confsubst) $(top_srcdir)/defs.man.in >$@.new $(SUBSTITUTIONS)
-	sed '/^\.$$/ d; /^\.\\"/ d' $@.new >$@.new2
-	rm -f $@.new
-	mv $@.new2 $@
+mandefs = $(top_srcdir)/common/defs.man
+makesummary = $(top_srcdir)/common/make-summary
+
+.1.in.1 .5.in.5 .7.in.7 .8.in.8:
+	sed '/^\.$$/ d; /^\.\\"/ d' $(mandefs) >$@.defs
+	sed -e '/@@@PRE@@@/ {' -e 'r$@.defs' -e 'd' -e '}' $< >$@.merge
+	$(confsubst) $@.merge >$@.subst $(SUBSTITUTIONS)
+	awk -f $(makesummary) $@.subst >$@.new
+	rm -f $@.defs $@.merge $@.subst && mv $@.new $@
 
 ###----- That's all, folks --------------------------------------------------