diff options
Diffstat (limited to 'bootstrap.am')
| -rw-r--r-- | bootstrap.am | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/bootstrap.am b/bootstrap.am index 8bce720..872ed70 100644 --- a/bootstrap.am +++ b/bootstrap.am @@ -11,11 +11,11 @@ export SCITECOPATH=@top_srcdir@/lib # available after the binary has been built in src/ # (ie. in SUBDIRS after src/). if BOOTSTRAP -SCITECO_MINIMAL = @top_builddir@/src/sciteco-minimal$(EXEEXT) -SCITECO_FULL = @top_builddir@/src/sciteco$(EXEEXT) +SCITECO_MINIMAL = @LAUNCHER@ @top_builddir@/src/sciteco-minimal$(EXEEXT) +SCITECO_FULL = @LAUNCHER@ @top_builddir@/src/sciteco$(EXEEXT) else -SCITECO_MINIMAL = @SCITECO@ -SCITECO_FULL = @SCITECO@ +SCITECO_MINIMAL = @LAUNCHER@ @SCITECO@ +SCITECO_FULL = @LAUNCHER@ @SCITECO@ endif # Path of installed `sciteco` binary, @@ -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)' <$< >$@ |