satmap: Separate and align columns in output properly

[empserver] / Make.mk

diff --git a/Make.mk b/Make.mk
index 9e222218a58a476bbbae9f5dc3bda8a922b01910..3cfad4dfe624897212d28e1c89f3e917ddadd244 100644 (file)
--- a/Make.mk
+++ b/Make.mk
@@ -62,8 +62,6 @@ include $(srcdir)/info/subjects.mk
 # Abbreviations
 topics := $(patsubst %.t,%,$(notdir $(tsrc)))
 info := $(topics) $(subjects) all TOP
-subjects.html := $(addprefix info.html/, $(addsuffix .html, $(subjects)))
-topics.html := $(addprefix info.html/, $(addsuffix .html, $(topics)))
 scripts := $(srcdir)/src/scripts
 depcomp := $(SHELL) $(srcdir)/depcomp
 tarball := $(SHELL) -e $(scripts)/tarball
@@ -295,7 +293,7 @@ info.nr/%: info/%.t
 # Pipes in make are a pain.  The "test -s" catches obvious errors.
 
 info.html/%.html: info/%.t
-       perl $(filter %.pl, $^) $< >$@
+       $(call quiet-command,perl $(srcdir)/info/emp2html.pl $(info) <$< >$@,GEN $@)
 
 
 ### Explicit rules
@@ -345,8 +343,7 @@ info.html/all.html: info.nr/all info/ls2html.pl
 
 $(info.nr): info/CRT.MAC info/INFO.MAC info/Blank.awk
 
-$(subjects.html) info.html/TOP.html: info/subj2html.pl
-$(topics.html): info/emp2html.pl
+$(info.html): info/emp2html.pl
 
 info.ps: info/TROFF.MAC info/INFO.MAC $(ttop) $(tsubj) $(tsrc)
        groff $^ >$@