diff options
| author | Roy Marples <roy@marples.name> | 2008-01-13 13:55:23 +0000 |
|---|---|---|
| committer | Roy Marples <roy@marples.name> | 2008-01-13 13:55:23 +0000 |
| commit | f7551870209efce978493991f723d839803534f0 (patch) | |
| tree | 2336a7c9d40449554b2af6f0d20b8aa04908cd00 /sh | |
| parent | 98b865bbc70b4646bb3a2bcdee3322dbce3766d1 (diff) | |
Change lib name during make, not install.
Diffstat (limited to 'sh')
| -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 |
3 files changed, 9 insertions, 13 deletions
diff --git a/sh/Makefile b/sh/Makefile index 6ee88013..3412b630 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 effce67d..effce67d 100644 --- a/sh/functions.sh +++ b/sh/functions.in diff --git a/sh/rc-functions.sh b/sh/rc-functions.in index 2a57709c..2a57709c 100755..100644 --- a/sh/rc-functions.sh +++ b/sh/rc-functions.in |