From b5e6f4c61b7b8e220fb3faa071e30b3dfc559f2f Mon Sep 17 00:00:00 2001 From: Robin Haberkorn Date: Mon, 31 Oct 2016 23:41:49 +0100 Subject: simplify bootstrap.am and avoid warning about GNU make $(shell) function * the `date` utility is now invoked by SciTECO which avoids automake warnings because of $(shell). The command line should work on Windows as well when SciTECO executes using cmd.exe (hopefully). --- bootstrap.am | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/bootstrap.am b/bootstrap.am index c64b6a6..7c878c6 100644 --- a/bootstrap.am +++ b/bootstrap.am @@ -1,8 +1,11 @@ -BOOTSTRAP_SCITECO = SCITECOPATH=@top_srcdir@/lib +# All SciTECO invocations should try to use the in-tree +# standard library library +export SCITECOPATH=@top_srcdir@/lib + if BOOTSTRAP -BOOTSTRAP_SCITECO += @top_builddir@/src/sciteco-minimal$(EXEEXT) +BOOTSTRAP_SCITECO = @top_builddir@/src/sciteco-minimal$(EXEEXT) else -BOOTSTRAP_SCITECO += @SCITECO@ +BOOTSTRAP_SCITECO = @SCITECO@ endif SUBST_MACRO = eb$<\e \ @@ -15,7 +18,8 @@ SUBST_MACRO = eb$<\e \ j \ j \ j \ - j \ + ^U[$$LC_ALL]C\e EG.d@DATE@ "+%d %b %Y"\e \ + j \ ew$@\e # Don't try to generate config.h: -- cgit v1.2.3