commit b963f33f8088dc0638df5c55879e354d0d40a163
parent b461a80e0521b0b597d97e594bb40c15e860e694
Author: Vincent Forest <vincent.forest@meso-star.com>
Date: Tue, 10 Oct 2023 16:52:17 +0200
Make Makefile templates independent of the make utility
This was true, except for some targets that explicitly called the make
utility instead of using the MAKE macro.
Diffstat:
4 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/src/git.mk.in b/src/git.mk.in
@@ -22,12 +22,12 @@ fetch_@NAME@: @NAME@/@TAG@
clean_@NAME@:
@if [ -d @NAME@/@TAG@ ]; then\
- cd -- "@NAME@/@TAG@" && make clean;\
+ cd -- "@NAME@/@TAG@" && $(MAKE) clean;\
fi
uninstall_@NAME@: fetch_@NAME@ prefix
@prefix=$$(cat .prefix) &&\
- cd -- "@NAME@/@TAG@" && make PREFIX="$${prefix}" uninstall
+ cd -- "@NAME@/@TAG@" && $(MAKE) PREFIX="$${prefix}" uninstall
distclean_@NAME@:
rm -rf @NAME@
diff --git a/src/noweb.mk.in b/src/noweb.mk.in
@@ -49,7 +49,7 @@ fetch_noweb: $(NOWEB_DIR)
clean_noweb:
if [ -d "$(NOWEB_DIR)/src" ]; then\
- cd -- "$(NOWEB_DIR)/src" && make clean;\
+ cd -- "$(NOWEB_DIR)/src" && $(MAKE) clean;\
fi
uninstall_noweb: fetch_noweb prefix
diff --git a/src/scdoc.mk.in b/src/scdoc.mk.in
@@ -38,7 +38,7 @@ fetch_scdoc: $(SCDOC_DIR)
clean_scdoc:
if [ -d "$(SCDOC_DIR)" ]; then \
- cd -- "$(SCDOC_DIR)" && make clean; \
+ cd -- "$(SCDOC_DIR)" && $(MAKE) clean; \
fi
uninstall_scdoc: fetch_scdoc prefix
diff --git a/src/sleef.mk.in b/src/sleef.mk.in
@@ -29,12 +29,12 @@ sleef: build_sleef prefix
@prefix=$$(cat .prefix) &&\
cd -- "$(SLEEF_DIR)/build" &&\
cmake -DCMAKE_INSTALL_PREFIX="$${prefix}" .. > /dev/null 2>&1 &&\
- make install
+ $(MAKE) install
build_sleef: fetch_sleef
@cd -- "$(SLEEF_DIR)/build" &&\
cmake $(SLEEF_CMAKE_OPTIONS) .. &&\
- make
+ $(MAKE)
$(SLEEF_DIR):
@git clone $(SLEEF_URL) "$@"
@@ -48,14 +48,14 @@ fetch_sleef: $(SLEEF_DIR)
clean_sleef:
if [ -d "$(SLEEF_DIR)/build" ]; then\
- cd -- "$(SLEEF_DIR)/build" && make clean;\
+ cd -- "$(SLEEF_DIR)/build" && $(MAKE) clean;\
fi
uninstall_sleef: fetch_sleef prefix
@prefix=$$(cat .prefix) &&\
cd -- "$(SLEEF_DIR)/build" &&\
cmake -DCMAKE_INSTALL_PREFIX="$${prefix}" .. &&\
- make install
+ $(MAKE) install
xargs rm -f < $(SLEEF_DIR)/build/install_manifest.txt
distclean_sleef: