aboutsummaryrefslogtreecommitdiff
path: root/sh/Makefile
diff options
context:
space:
mode:
authorRoy Marples <roy@marples.name>2009-05-29 14:15:12 +0100
committerRoy Marples <roy@marples.name>2009-05-29 14:15:12 +0100
commit83e82c452e89bf27de2a7b01bc2356c9050b2a18 (patch)
treea4f8843c7c02a6b51abb06a16f0a9a6665facc71 /sh/Makefile
parent9c5faf231ccf50695270034ab63f747fa2bef1d7 (diff)
parenta518d34549fd80268e9c70d2300808b63c54825c (diff)
Merge branch 'master' of ssh://roy.marples.name/var/git/openrc
Diffstat (limited to 'sh/Makefile')
-rw-r--r--sh/Makefile7
1 files changed, 3 insertions, 4 deletions
diff --git a/sh/Makefile b/sh/Makefile
index 7ee04338..73d46418 100644
--- a/sh/Makefile
+++ b/sh/Makefile
@@ -1,4 +1,4 @@
-DIR= ${PREFIX}/${RC_LIB}/sh
+DIR= ${LIBEXECDIR}/sh
SRCS= functions.sh.in gendepends.sh.in init-common-post.sh.in \
rc-functions.sh.in runscript.sh.in
INC= init-common-post.sh rc-mount.sh functions.sh rc-functions.sh
@@ -13,9 +13,8 @@ include ${MK}/scripts.mk
_installafter:
${INSTALL} -d ${DESTDIR}/${INITDIR}
- @# Put functions.sh into the init.d dir so 3rd party apps don't have to
- @# be multilib aware
- ln -snf ${PREFIX}/${RC_LIB}/sh/functions.sh ${DESTDIR}/${INITDIR} || exit $$?
+ @# Put functions.sh into init for backwards compat
+ ln -snf ${LIBEXECDIR}/sh/functions.sh ${DESTDIR}/${INITDIR} || exit $$?
check test::
./runtests.sh