From: Ben Pfaff Date: Thu, 29 Oct 2020 06:01:12 +0000 (-0700) Subject: doc: Use --css-ref option to makeinfo, instead of postprocessing with sed. X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a58b271cad7e72bc5f2c0e8f7e98fadc27759089;p=pspp doc: Use --css-ref option to makeinfo, instead of postprocessing with sed. This option was introduced with makeinfo 4.11, released in 2007, so it should be widely available. --- diff --git a/doc/automake.mk b/doc/automake.mk index c94608e98a..bf09d6a3eb 100644 --- a/doc/automake.mk +++ b/doc/automake.mk @@ -202,15 +202,7 @@ $(EXAMPLE_TXTS) $(EXAMPLE_HTML): $(pspp_output) $(AM_V_GEN)sed 's/@/@@/g' < $< > $@.tmp $(AM_V_at)mv $@.tmp $@ -# Insert the link tag for the cascading style sheet. -# But make sure these operations are idempotent. -html-local: - for h in doc/pspp.html/*.html; do \ - if grep -Fq '/i \\\ -' $$h; \ - done - +AM_MAKEINFOHTMLFLAGS = $(AM_MAKEINFOFLAGS) --css-ref=pspp-manual.css install-html-local: html-local $(MKDIR_P) $(DESTDIR)$(prefix)/share/doc/pspp/pspp.html $(INSTALL_DATA) ${top_srcdir}/doc/pspp-manual.css $(DESTDIR)$(prefix)/share/doc/pspp/pspp.html