commit fc4a5fd91db1fff29c6b04ff73c75f63242f0f80
parent f19a2ae0e702d310aa7c643a48ebcb8838ad4503
Author: Vincent Forest <vincent.forest@meso-star.com>
Date: Thu, 24 Feb 2022 16:53:35 +0100
Makefiles: replace the "sh" invocation by $(SHELL)
Diffstat:
8 files changed, 53 insertions(+), 53 deletions(-)
diff --git a/Makefile b/Makefile
@@ -63,4 +63,4 @@ install: .htaccess
.htaccess: build_htaccess.sh
@echo "Building $@"
- @sh build_htaccess.sh /$$(basename "$(PREFIX)") > $@
+ @$(SHELL) build_htaccess.sh /$$(basename "$(PREFIX)") > $@
diff --git a/art/Makefile b/art/Makefile
@@ -75,31 +75,31 @@ art_build.sh: ../meso-menu.sh
################################################################################
art.html: art.html.in art_build.sh
@echo "Building $@"
- @sh art_build.sh overview > $@
+ @$(SHELL) art_build.sh overview > $@
kspectrum.html: kspectrum.html.in art_build.sh Makefile $(KSPECTRUM_IMG)
@echo "Building $@"
- @sh art_build.sh kspectrum $(KSPECTRUM_VERSION) > $@
+ @$(SHELL) art_build.sh kspectrum $(KSPECTRUM_VERSION) > $@
kdistribution.html: kdistribution.html.in art_build.sh Makefile
@echo "Building $@"
- @sh art_build.sh kdistribution $(KDISTRIBUTION_VERSION) > $@
+ @$(SHELL) art_build.sh kdistribution $(KDISTRIBUTION_VERSION) > $@
hr_ppart.html: hr_ppart.html.in art_build.sh $(HR_PPART_IMG)
@echo "Building $@"
- @sh art_build.sh hr_ppart > $@
+ @$(SHELL) art_build.sh hr_ppart > $@
ppart_lw.html: ppart_lw.html.in Tb.svg art_build.sh
@echo "Building $@"
- @sh art_build.sh ppart_lw > $@
+ @$(SHELL) art_build.sh ppart_lw > $@
ppart_sw.html: ppart_sw.html.in si_flux.svg art_build.sh
@echo "Building $@"
- @sh art_build.sh ppart_sw > $@
+ @$(SHELL) art_build.sh ppart_sw > $@
karine.html: karine.html.in art_build.sh Makefile $(KARINE_IMG)
@echo "Building $@"
- @sh art_build.sh karine $(KARINE_VERSION) > $@
+ @$(SHELL) art_build.sh karine $(KARINE_VERSION) > $@
################################################################################
# Check files
@@ -117,8 +117,8 @@ check_shells:
################################################################################
.sig: Makefile ../configure_targets.sh
@echo "Setup .sig"
- @sh ../configure_targets.sh sig $(ART_PKG) > .sig
+ @$(SHELL) ../configure_targets.sh sig $(ART_PKG) > .sig
.chk: Makefile ../configure_targets.sh
@echo "Setup .chk"
- @sh ../configure_targets.sh chk $(HTML) > .chk
+ @$(SHELL) ../configure_targets.sh chk $(HTML) > .chk
diff --git a/htrdr/Makefile b/htrdr/Makefile
@@ -137,7 +137,7 @@ htrdr.html: \
htrdr_build.sh \
Makefile
@echo "Building $@"
- @sh htrdr_build.sh overview $(HTRDR_README) $(HTRDR_VERSION) > $@
+ @$(SHELL) htrdr_build.sh overview $(HTRDR_README) $(HTRDR_VERSION) > $@
$(HTRDR_README) $(MAN):
@echo "Extracting data from $(HTRDR_ARCH)"
@@ -148,7 +148,7 @@ $(HTRDR_README) $(MAN):
################################################################################
htrdr-docs.html: htrdr-docs.html.in
@echo "Building $@"
- @sh htrdr_build.sh documentations > $@
+ @$(SHELL) htrdr_build.sh documentations > $@
################################################################################
# Atmosphere Starter-Pack
@@ -159,7 +159,7 @@ htrdr-atmosphere-spk.html: \
$(ATMSPK_README) \
htrdr_build.sh
@echo "Building $@"
- @sh htrdr_build.sh atmspk $(ATMSPK_README) $(ATMSPK_VERSION) > $@
+ @$(SHELL) htrdr_build.sh atmspk $(ATMSPK_README) $(ATMSPK_VERSION) > $@
$(ATMSPK_README):
@echo "Extracting data from $(ATMSPK_ARCH)"
@@ -174,7 +174,7 @@ htrdr-combustion-spk.html: \
$(COMSPK_README) \
htrdr_build.sh
@echo "Building $@"
- @sh htrdr_build.sh comspk $(COMSPK_README) $(COMSPK_VERSION) > $@
+ @$(SHELL) htrdr_build.sh comspk $(COMSPK_README) $(COMSPK_VERSION) > $@
$(COMSPK_README):
@echo "Extracting data from $(COMSPK_ARCH)"
@@ -196,13 +196,13 @@ check_shells:
################################################################################
.sig: Makefile ../configure_targets.sh
@echo "Setup .sig"
- @sh ../configure_targets.sh sig $(ATMSPK_PKG) $(COMSPK_PKG) > .sig
+ @$(SHELL) ../configure_targets.sh sig $(ATMSPK_PKG) $(COMSPK_PKG) > .sig
.chk: Makefile ../configure_targets.sh
@echo "Setup .chk"
- @sh ../configure_targets.sh chk $(HTML) > .chk
+ @$(SHELL) ../configure_targets.sh chk $(HTML) > .chk
.man: Makefile ../configure_targets.sh
@echo "Setup .man"
- @sh ../configure_targets.sh man htrdr $(HTRDR_VERSION) $(MAN) > .man
+ @$(SHELL) ../configure_targets.sh man htrdr $(HTRDR_VERSION) $(MAN) > .man
diff --git a/misc/Makefile b/misc/Makefile
@@ -48,23 +48,23 @@ misc_build.sh: ../meso-menu.sh
################################################################################
about-en.html: about-en.html.in misc_build.sh
@echo "Building $@"
- @sh misc_build.sh about en > $@
+ @$(SHELL) misc_build.sh about en > $@
about-fr.html: about-fr.html.in misc_build.sh
@echo "Building $@"
- @sh misc_build.sh about fr > $@
+ @$(SHELL) misc_build.sh about fr > $@
legal-en.html: legal-en.html.in misc_build.sh
@echo "Building $@"
- @sh misc_build.sh legal en > $@
+ @$(SHELL) misc_build.sh legal en > $@
legal-fr.html: legal-fr.html.in misc_build.sh
@echo "Building $@"
- @sh misc_build.sh legal fr > $@
+ @$(SHELL) misc_build.sh legal fr > $@
pgp_signatures.html: misc_build.sh
@echo "Building $@"
- @sh misc_build.sh pgp > $@
+ @$(SHELL) misc_build.sh pgp > $@
################################################################################
# Check files
@@ -79,4 +79,4 @@ check_shells:
.chk: Makefile ../configure_targets.sh
@echo "Setup .chk"
- @sh ../configure_targets.sh chk $(HTML) > .chk
+ @$(SHELL) ../configure_targets.sh chk $(HTML) > .chk
diff --git a/schiff/Makefile b/schiff/Makefile
@@ -71,14 +71,14 @@ schiff_build.sh: ../meso-menu.sh
################################################################################
schiff.html: schiff.html.in $(IMG) schiff_build.sh
@echo "Building $@"
- @sh schiff_build.sh overview $(SCHIFF_VERSION) > $@
+ @$(SHELL) schiff_build.sh overview $(SCHIFF_VERSION) > $@
################################################################################
# Downloads
################################################################################
schiff-downloads.html: $(SCHIFF_SIG) $(SCHIFF_README) schiff_build.sh
@echo "Building $@"
- @sh schiff_build.sh downloads $(SCHIFF_README) > $@
+ @$(SHELL) schiff_build.sh downloads $(SCHIFF_README) > $@
$(SCHIFF_README) $(MAN):
@echo "Extracting data from $(SCHIFF_ARCH)"
@@ -100,12 +100,12 @@ check_shells:
################################################################################
.sig: Makefile ../configure_targets.sh
@echo "Setup .sig"
- @sh ../configure_targets.sh sig $(SCHIFF_PKG)> .sig
+ @$(SHELL) ../configure_targets.sh sig $(SCHIFF_PKG)> .sig
.chk: Makefile ../configure_targets.sh
@echo "Setup .chk"
- @sh ../configure_targets.sh chk $(HTML) > .chk
+ @$(SHELL) ../configure_targets.sh chk $(HTML) > .chk
.man: Makefile ../configure_targets.sh
@echo "Setup .man"
- @sh ../configure_targets.sh man Schiff $(SCHIFF_VERSION) $(MAN) > .man
+ @$(SHELL) ../configure_targets.sh man Schiff $(SCHIFF_VERSION) $(MAN) > .man
diff --git a/solstice/Makefile b/solstice/Makefile
@@ -113,14 +113,14 @@ solstice_build.sh: ../meso-menu.sh
################################################################################
solstice.html: solstice.html.in themis.png solstice_build.sh Makefile
@echo "Building $@"
- @sh solstice_build.sh overview $(SOLSTICE_VERSION) > $@
+ @$(SHELL) solstice_build.sh overview $(SOLSTICE_VERSION) > $@
################################################################################
# Downloads web page
################################################################################
solstice-downloads.html: $(SOLSTICE_SIG) $(SOLSTICE_README) solstice_build.sh
@echo "Building $@"
- @sh solstice_build.sh downloads $(SOLSTICE_README) > $@
+ @$(SHELL) solstice_build.sh downloads $(SOLSTICE_README) > $@
$(SOLSTICE_README) $(MAN):
@echo "Extracting data from $(SOLSTICE_ARCH)"
@@ -134,7 +134,7 @@ solstice-resources.html: $(SOLPP_SIG) $(SOLPP_README) \
solstice-pp.html.in \
solstice_build.sh
@echo "Building $@"
- @sh solstice_build.sh resources $(SOLPP_README) $(SOLPP_VERSION) > $@
+ @$(SHELL) solstice_build.sh resources $(SOLPP_README) $(SOLPP_VERSION) > $@
$(SOLPP_README):
@echo "Extracting $@ from $(SOLPP_ARCH)"
@@ -156,12 +156,12 @@ check_shells:
################################################################################
.sig: Makefile ../configure_targets.sh
@echo "Setup .sig"
- @sh ../configure_targets.sh sig $(SOLSTICE_PKG) $(SOLPP_PKG) > .sig
+ @$(SHELL) ../configure_targets.sh sig $(SOLSTICE_PKG) $(SOLPP_PKG) > .sig
.chk: Makefile ../configure_targets.sh
@echo "Setup .chk"
- @sh ../configure_targets.sh chk $(HTML) > .chk
+ @$(SHELL) ../configure_targets.sh chk $(HTML) > .chk
.man: Makefile ../configure_targets.sh
@echo "Setup .man"
- @sh ../configure_targets.sh man Solstice $(SOLSTICE_VERSION) $(MAN) > .man
+ @$(SHELL) ../configure_targets.sh man Solstice $(SOLSTICE_VERSION) $(MAN) > .man
diff --git a/star-engine/Makefile b/star-engine/Makefile
@@ -133,14 +133,14 @@ star_engine_build.sh: ../meso-menu.sh
################################################################################
star-engine.html: star-engine.html.in star_engine_build.sh Makefile
@echo "Building $@"
- @sh star_engine_build.sh overview $(STAR_ENGINE_VERSION) > $@
+ @$(SHELL) star_engine_build.sh overview $(STAR_ENGINE_VERSION) > $@
star-engine-downloads.html:\
$(STAR_ENGINE_SIG)\
$(STAR_ENGINE_README)\
star_engine_build.sh
@echo "Building $@"
- @sh star_engine_build.sh downloads $(STAR_ENGINE_README) > $@
+ @$(SHELL) star_engine_build.sh downloads $(STAR_ENGINE_README) > $@
star-2d.html:\
star-2d.html.in\
@@ -148,7 +148,7 @@ star-2d.html:\
$(STAR_2D_README)\
star_engine_build.sh
@echo "Building $@"
- @sh star_engine_build.sh component Star-2D $(STAR_2D_README) $(STAR_2D_HEADER) > $@
+ @$(SHELL) star_engine_build.sh component Star-2D $(STAR_2D_README) $(STAR_2D_HEADER) > $@
star-3d.html:\
star-3d.html.in\
@@ -157,7 +157,7 @@ star-3d.html:\
star_engine_build.sh\
foam.jpg
@echo "Building $@"
- @sh star_engine_build.sh component Star-3D $(STAR_3D_README) $(STAR_3D_HEADER) > $@
+ @$(SHELL) star_engine_build.sh component Star-3D $(STAR_3D_README) $(STAR_3D_HEADER) > $@
star-sp.html:\
star-sp.html.in\
@@ -166,7 +166,7 @@ star-sp.html:\
star_engine_build.sh \
cumulative.svg
@echo "Building $@"
- @sh star_engine_build.sh component Star-SP $(STAR_SP_README) $(STAR_SP_HEADER) > $@
+ @$(SHELL) star_engine_build.sh component Star-SP $(STAR_SP_README) $(STAR_SP_HEADER) > $@
star-sf.html:\
star-sf.html.in\
@@ -175,7 +175,7 @@ star-sf.html:\
star_engine_build.sh\
polar.svg
@echo "Building $@"
- @sh star_engine_build.sh component Star-SF $(STAR_SF_README) $(STAR_SF_HEADER) > $@
+ @$(SHELL) star_engine_build.sh component Star-SF $(STAR_SF_README) $(STAR_SF_HEADER) > $@
star-vx.html:\
star-vx.html.in\
@@ -184,7 +184,7 @@ star-vx.html:\
star_engine_build.sh\
octree.jpg
@echo "Building $@"
- @sh star_engine_build.sh component Star-VX $(STAR_VX_README) $(STAR_VX_HEADER) > $@
+ @$(SHELL) star_engine_build.sh component Star-VX $(STAR_VX_README) $(STAR_VX_HEADER) > $@
star-uvm.html:\
star-uvm.html.in\
@@ -192,7 +192,7 @@ star-uvm.html:\
$(STAR_2D_README)\
star_engine_build.sh
@echo "Building $@"
- @sh star_engine_build.sh component Star-UVM $(STAR_UVM_README) $(STAR_UVM_HEADER) > $@
+ @$(SHELL) star_engine_build.sh component Star-UVM $(STAR_UVM_README) $(STAR_UVM_HEADER) > $@
star-geom.html:\
star-geom.html.in\
@@ -200,7 +200,7 @@ star-geom.html:\
star_engine_build.sh\
super_shape.jpg
@echo "Building $@"
- @sh star_engine_build.sh star_geom $(STAR_GEOM_HEADER) > $@
+ @$(SHELL) star_engine_build.sh star_geom $(STAR_GEOM_HEADER) > $@
$(STAR_ENGINE_HEADERS) $(STAR_ENGINE_READMES):
@echo "Extracting data from $(STAR_ENGINE_ARCH)"
@@ -222,8 +222,8 @@ check_shells:
################################################################################
.sig: Makefile ../configure_targets.sh
@echo "Setup .sig"
- @sh ../configure_targets.sh sig $(STAR_ENGINE_PKG) > .sig
+ @$(SHELL) ../configure_targets.sh sig $(STAR_ENGINE_PKG) > .sig
.chk: Makefile ../configure_targets.sh
@echo "Setup .chk"
- @sh ../configure_targets.sh chk $(HTML) > .chk
+ @$(SHELL) ../configure_targets.sh chk $(HTML) > .chk
diff --git a/stardis/Makefile b/stardis/Makefile
@@ -124,18 +124,18 @@ stardis.html: \
stardis_build.sh \
Makefile
@echo "Building $@"
- @sh stardis_build.sh overview $(STARDIS_VERSION) > $@
+ @$(SHELL) stardis_build.sh overview $(STARDIS_VERSION) > $@
################################################################################
# Consortium web pages
################################################################################
consortium-fr.html: consortium-fr.html.in edf_logo.svg stardis_build.sh
@echo "Building $@"
- @sh stardis_build.sh consortium fr > $@
+ @$(SHELL) stardis_build.sh consortium fr > $@
consortium-en.html: consortium-en.html.in edf_logo.svg stardis_build.sh
@echo "Building $@"
- @sh stardis_build.sh consortium en > $@
+ @$(SHELL) stardis_build.sh consortium en > $@
################################################################################
# Download web pages
@@ -147,7 +147,7 @@ stardis-downloads.html:\
$(STARDIS_GREEN_README) \
stardis_build.sh
@echo "Building $@"
- @sh stardis_build.sh downloads $(STARDIS_SOLVER_README) $(STARDIS_README) \
+ @$(SHELL) stardis_build.sh downloads $(STARDIS_SOLVER_README) $(STARDIS_README) \
$(STARDIS_GREEN_README) > $@
$(STARDIS_ARCH_FILES):
@@ -164,7 +164,7 @@ starter-pack.html: \
stardis_build.sh \
Makefile
@echo "Building $@"
- @sh stardis_build.sh starter_pack $(STARTER_PACK_README) $(STARTER_PACK_VERSION) > $@
+ @$(SHELL) stardis_build.sh starter_pack $(STARTER_PACK_README) $(STARTER_PACK_VERSION) > $@
$(STARTER_PACK_README):
@echo "Extracting data from $(STARTER_PACK_ARCH)"
@@ -186,12 +186,12 @@ check_shells:
################################################################################
.sig: Makefile ../configure_targets.sh
@echo "Setup .sig"
- @sh ../configure_targets.sh sig $(STARDIS_PKG) $(STARTER_PACK_PKG) > .sig
+ @$(SHELL) ../configure_targets.sh sig $(STARDIS_PKG) $(STARTER_PACK_PKG) > .sig
.chk: Makefile ../configure_targets.sh
@echo "Setup .chk"
- @sh ../configure_targets.sh chk $(HTML) > .chk
+ @$(SHELL) ../configure_targets.sh chk $(HTML) > .chk
.man: Makefile ../configure_targets.sh
@echo "Setup .man"
- @sh ../configure_targets.sh man Stardis $(STARDIS_VERSION) $(MAN) > .man
+ @$(SHELL) ../configure_targets.sh man Stardis $(STARDIS_VERSION) $(MAN) > .man
