From b1e2913435c0e375ab7f1f41430ea73823021960 Mon Sep 17 00:00:00 2001 From: "Darryl L. Miles" Date: Wed, 8 Jan 2025 09:02:35 +0000 Subject: [PATCH] Makefile: sed => ${SED} This will find GNU make in preference if available on the platform. --- Makefile | 2 +- oa/Makefile | 2 +- tcltk/Makefile | 8 ++++---- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Makefile b/Makefile index 6c0322ea..6ae63ef3 100644 --- a/Makefile +++ b/Makefile @@ -136,7 +136,7 @@ distclean: dist: ${RM} scripts/magic.spec magic-${VERSION} magic-${VERSION}.tgz - sed -e /@VERSION@/s%@VERSION@%${VERSION}% \ + ${SED} -e /@VERSION@/s%@VERSION@%${VERSION}% \ scripts/magic.spec.in > scripts/magic.spec ${LN} -nsf . magic-${VERSION} tar zchvf magic-${VERSION}.tgz --exclude CVS \ diff --git a/oa/Makefile b/oa/Makefile index dea9feee..9e4c746a 100644 --- a/oa/Makefile +++ b/oa/Makefile @@ -25,7 +25,7 @@ DEP_FILES = $(addprefix .deps/,$(SRCS:.c=.P))\ ${CXX} ${CXX_CFLAGS} ${OTHER_CFLAGS} ${CXX_INCLUDES} -Wp,-MD,.deps/$(*F).pp -c $< @-cp .deps/$(*F).pp .deps/$(*F).P; \ tr ' ' '\012' < .deps/$(*F).pp \ - | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \ + | ${SED} -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \ >> .deps/$(*F).P; \ ${RM} .deps/$(*F).pp diff --git a/tcltk/Makefile b/tcltk/Makefile index 3e74017d..7e29acd7 100644 --- a/tcltk/Makefile +++ b/tcltk/Makefile @@ -62,22 +62,22 @@ magicdnull: magicdnull.c ${MAGICDIR}/defs.mak ${LIBS} magic.tcl: magic.tcl.in ${MAGICDIR}/defs.mak ${MAGICDIR}/VERSION - sed -e /MAGIC_VERSION/s%MAGIC_VERSION%${MAGIC_VERSION}%g \ + ${SED} -e /MAGIC_VERSION/s%MAGIC_VERSION%${MAGIC_VERSION}%g \ -e /MAGIC_REVISION/s%MAGIC_REVISION%${MAGIC_REVISION}%g \ -e /MAGIC_COMMIT/s%MAGIC_COMMIT%${MAGIC_COMMIT}%g \ magic.tcl.in > magic.tcl magic.sh: magic.sh.in ${MAGICDIR}/defs.mak - sed -e /TCL_DIR/s%TCL_DIR%${TCLDIR}%g \ + ${SED} -e /TCL_DIR/s%TCL_DIR%${TCLDIR}%g \ -e /TCLLIB_DIR/s%TCLLIB_DIR%${TCL_LIB_DIR}%g \ -e /WISH_EXE/s%WISH_EXE%${WISH_EXE}%g magic.sh.in > magic.sh ext2spice.sh: ext2spice.sh.in ${MAGICDIR}/defs.mak - sed -e /TCL_DIR/s%TCL_DIR%${TCLDIR}%g \ + ${SED} -e /TCL_DIR/s%TCL_DIR%${TCLDIR}%g \ ext2spice.sh.in > ext2spice.sh ext2sim.sh: ext2sim.sh.in ${MAGICDIR}/defs.mak - sed -e /TCL_DIR/s%TCL_DIR%${TCLDIR}%g \ + ${SED} -e /TCL_DIR/s%TCL_DIR%${TCLDIR}%g \ ext2sim.sh.in > ext2sim.sh $(DESTDIR)${INSTALL_TCLDIR}/%: %