diff options
| -rw-r--r-- | mk/scripts.mk | 4 | ||||
| -rw-r--r-- | sh/Makefile | 22 | ||||
| -rw-r--r-- | sh/functions.in (renamed from sh/functions.sh) | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | sh/rc-functions.in (renamed from sh/rc-functions.sh) | 0 |
4 files changed, 11 insertions, 15 deletions
diff --git a/mk/scripts.mk b/mk/scripts.mk index a7f3dd8..efbca78 100644 --- a/mk/scripts.mk +++ b/mk/scripts.mk @@ -33,6 +33,6 @@ install: realinstall ${INSTALLAFTER} # A lot of scripts don't have anything to clean # Also, some rm implentation require a file argument regardless of error # so we ensure that it has a bogus argument -CLEANFILES?= .bogus +CLEANFILES+= ${OBJS} clean: - rm -f ${OBJS} ${CLEANFILES} + if test -n "${CLEANFILES}"; then rm -f ${CLEANFILES}; fi diff --git a/sh/Makefile b/sh/Makefile index 6ee8801..3412b63 100644 --- a/sh/Makefile +++ b/sh/Makefile @@ -1,29 +1,25 @@ DIR= ${RC_LIB}/sh -INC= functions.sh init-common-post.sh rc-functions.sh rc-mount.sh +SRCS= functions.in rc-functions.in +OBJS= ${SRCS:.in=.sh} +INC= init-common-post.sh rc-mount.sh ${OBJS} BIN= gendepends.sh net.sh runscript.sh MK= ../mk - -INSTALLAFTER= _installafter - # To get NET_LO include ${MK}/os.mk include Makefile.${SUBOS} - include ${MK}/scripts.mk +# Ensure that the lib name is correct +.SUFFIXES: .in .sh +.in.sh: + sed -e 's:/lib/:/${LIBNAME}/:g' $< > $@ + +INSTALLAFTER= _installafter _installafter: - @# Handle lib correctly - if test ${LIBNAME} != "lib"; then \ - sed -i'.bak' -e 's,/lib/,/${LIBNAME}/,g' ${DESTDIR}/${RC_LIB}/sh/functions.sh || exit $$?; \ - rm -f ${DESTDIR}/${RC_LIB}/sh/functions.sh.bak; \ - sed -i'.bak' -e 's,/lib/,/${LIBNAME}/,g' ${DESTDIR}/${RC_LIB}/sh/rc-functions.sh || exit $$?; \ - rm -f ${DESTDIR}/${RC_LIB}/sh/rc-functions.sh.bak; \ - fi ${INSTALL} -d ${DESTDIR}/etc/init.d @# Provide an init script for the loopback interface ln -snf ${RC_LIB}/sh/net.sh ${DESTDIR}/etc/init.d/${NET_LO} || exit $$? @# Put functions.sh into the init.d dir so 3rd party apps don't have to @# be multilib aware ln -snf ${RC_LIB}/sh/functions.sh ${DESTDIR}/etc/init.d || exit $$? - diff --git a/sh/functions.sh b/sh/functions.in index effce67..effce67 100644 --- a/sh/functions.sh +++ b/sh/functions.in diff --git a/sh/rc-functions.sh b/sh/rc-functions.in index 2a57709..2a57709 100755..100644 --- a/sh/rc-functions.sh +++ b/sh/rc-functions.in |