From c5510d684e4879ab9a5295b4a1981888a4268627 Mon Sep 17 00:00:00 2001
From: Robin Haberkorn <robin.haberkorn@googlemail.com>
Date: Sun, 3 Aug 2025 17:56:04 +0300
Subject: simplified the htbl.tes preprocessor and the SUBST_MACRO using new
 --quiet, --stdin and --stdout options

* htbl.tes now reads from stdin and writes to stdout.
  Allows avoiding temporary `*.htbl` files
* grosciteco.tes still cannot be simplified since --stdin cannot be combined with
  passing command-line arguments (FIXME).
---
 bootstrap.am | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

(limited to 'bootstrap.am')

diff --git a/bootstrap.am b/bootstrap.am
index 8bce720..965389f 100644
--- a/bootstrap.am
+++ b/bootstrap.am
@@ -24,8 +24,7 @@ endif
 SCITECO_INSTALLED = \
 	$(bindir)/`echo sciteco | @SED@ '$(transform)'`$(EXEEXT)
 
-SUBST_MACRO = EB$<\e \
-              <FS@PACKAGE^Q@\e@PACKAGE@\e;>J \
+SUBST_MACRO = <FS@PACKAGE^Q@\e@PACKAGE@\e;>J \
               <FS@PACKAGE_NAME^Q@\e@PACKAGE_NAME@\e;>J \
               <FS@PACKAGE_VERSION^Q@\e@PACKAGE_VERSION@\e;>J \
               <FS@PACKAGE_URL^Q@\e@PACKAGE_URL@\e;>J \
@@ -34,12 +33,11 @@ SUBST_MACRO = EB$<\e \
               <FS@scitecodatadir^Q@\e$(scitecodatadir)\e;>J \
               <FS@scitecolibdir^Q@\e$(scitecolibdir)\e;>J \
               <FS@TECO_INTEGER^Q@\e@TECO_INTEGER@\e;>J \
-              <FS@DATE^Q@\e$(shell LC_ALL=C @DATE@ "+%d %b %Y")\e;>J \
-              EW$@\e
+              <FS@DATE^Q@\e;$(shell LC_ALL=C @DATE@ "+%d %b %Y")\e;>J
 
 # The SciTECO-based substitutor must not process config.h.in.
 @top_srcdir@/config.h: ;
 
 SUFFIXES = .in
 .in:
-	$(SCITECO_MINIMAL) -e $$'$(SUBST_MACRO)'
+	$(SCITECO_MINIMAL) -qioe $$'$(SUBST_MACRO)' <$< >$@
-- 
cgit v1.2.3