diff options
| author | Robin Haberkorn <robin.haberkorn@googlemail.com> | 2016-10-31 23:41:49 +0100 |
|---|---|---|
| committer | Robin Haberkorn <robin.haberkorn@googlemail.com> | 2016-11-01 07:17:25 +0100 |
| commit | b5e6f4c61b7b8e220fb3faa071e30b3dfc559f2f (patch) | |
| tree | adf7fa4ac13a5bd63a8a3d939ddc0935a2d9084b | |
| parent | 0e805701b5840d0cf37fc2f744f3c62efc0c6202 (diff) | |
| download | sciteco-b5e6f4c61b7b8e220fb3faa071e30b3dfc559f2f.tar.gz | |
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).
| -rw-r--r-- | bootstrap.am | 12 |
1 files 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 \ <fs@pkgdatadir^Q@\e$(pkgdatadir)\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 \ + ^U[$$LC_ALL]C\e EG.d@DATE@ "+%d %b %Y"\e \ + <fs@DATE^Q@\e^EQ.d\e; -D>j \ ew$@\e # Don't try to generate config.h: |