Change lib name during make, not install.

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 

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 $$?
-