The previous revision of Make.mk didn't work with separate build

trees.  Do it in a way that does.

diff --git a/Make.mk b/Make.mk
index 3adb4fbf18e4ffd05de1e646a2478e0ca63fb475..26e814c7a66a2a96c143586e2933087ca9d5570c 100644 (file)
--- a/Make.mk
+++ b/Make.mk
@@ -235,7 +235,9 @@ endif
 
 
 info.nr/%: info/%.t
-       (cd $(srcdir)/info && $(NROFF) CRT.MAC $(notdir $< )) | $(AWK) -f $(filter %/Blank.awk, $^) >$@
+       $(NROFF) $(filter %.MAC, $^) $< | $(AWK) -f $(filter %/Blank.awk, $^) >$@
+# Pipes in make are a pain.  Catch obvious errors:
+       @test -s $@
 
 info.html/%.html: info/%.t
        perl $(filter %.pl, $^) $< >$@

diff --git a/info/CRT.MAC b/info/CRT.MAC
index 5aead35bb50182d769048d7cb6f6ae400fc032bb..db6ed1b3c00aabf429a67e973efd853acd866521 100644 (file)
--- a/info/CRT.MAC
+++ b/info/CRT.MAC
@@ -30,4 +30,5 @@
 .ev 2
 .ll 7.8i        \" Line length: 7.8 inches
 .ev
-.so INFO.MAC \" Read in INFO.MAC macros
+\" .so INFO.MAC \" Read in INFO.MAC macros
+\" except that's done by make now