aboutsummaryrefslogtreecommitdiff
path: root/mk
diff options
context:
space:
mode:
authorRoy Marples <roy@marples.name>2009-05-23 20:38:12 +0100
committerRoy Marples <roy@marples.name>2009-05-23 20:38:12 +0100
commitc0fd1b49e49cec28c1f5a3a76f9db11c62e550dc (patch)
treefe1f406f976dbcec3d7225ccf1b0f08f6957dfcc /mk
parent5294abe6171610a1aa0eb093774bed9bb965c9cf (diff)
Move non compiled libraries from /lib/rc to /libexec/rc
OpenRC version is now stored as plaintext in /libexec/rc/version Plugins (cursplash, splashutils) will have to be re-compiled to pickup the new directories. State data needs to be moved from /lib/rc/init.d to /libexec/rc/init.d as well.
Diffstat (limited to 'mk')
-rw-r--r--mk/git.mk8
-rw-r--r--mk/scripts.mk2
-rw-r--r--mk/sys.mk2
3 files changed, 11 insertions, 1 deletions
diff --git a/mk/git.mk b/mk/git.mk
new file mode 100644
index 00000000..54a98ef4
--- /dev/null
+++ b/mk/git.mk
@@ -0,0 +1,8 @@
+_GITVER_SH= if git rev-parse --short HEAD >/dev/null 2>&1; then \
+ printf "."; \
+ git rev-parse --short HEAD; \
+ else \
+ echo ""; \
+ fi
+_GITVER!= ${_GITVER_SH}
+GITVER= ${_GITVER}$(shell ${_GITVER_SH})
diff --git a/mk/scripts.mk b/mk/scripts.mk
index f311acfa..bd7ec6bb 100644
--- a/mk/scripts.mk
+++ b/mk/scripts.mk
@@ -12,7 +12,7 @@ _PKG_SED!= ${_PKG_SED_SH}
_LCL_SED_SH= if test "${PREFIX}" = "${LOCAL_PREFIX}"; then echo "-e 's:@LOCAL_PREFIX@::g'"; else echo "-e 's:@LOCAL_PREFIX@:${LOCAL_PREFIX}:g'"; fi
_LCL_SED!= ${_LCL_SED_SH}
-SED_REPLACE= -e 's:@SHELL@:${SH}:g' -e 's:@LIB@:${LIBNAME}:g' -e 's:@SYSCONFDIR@:${SYSCONFDIR}:g' -e 's:@PREFIX@:${PREFIX}:g' ${_PKG_SED}$(shell ${_PKG_SED_SH}) ${_LCL_SED}$(shell ${_LCL_SED_SH})
+SED_REPLACE= -e 's:@SHELL@:${SH}:g' -e 's:@LIB@:${LIBNAME}:g' -e 's:@SYSCONFDIR@:${SYSCONFDIR}:g' -e 's:@LIBEXECDIR@:${LIBEXECDIR}:g' -e 's:@PREFIX@:${PREFIX}:g' ${_PKG_SED}$(shell ${_PKG_SED_SH}) ${_LCL_SED}$(shell ${_LCL_SED_SH})
# Tweak our shell scripts
.SUFFIXES: .sh.in .in
diff --git a/mk/sys.mk b/mk/sys.mk
index 42a24fba..e22731b6 100644
--- a/mk/sys.mk
+++ b/mk/sys.mk
@@ -35,6 +35,8 @@ LIBDIR?= ${UPREFIX}/${LIBNAME}
LIBMODE?= 0444
SHLIBDIR?= ${PREFIX}/${LIBNAME}
+LIBEXECDIR?= ${PREFIX}/libexec/rc
+
MANPREFIX?= ${UPREFIX}/share
MANDIR?= ${MANPREFIX}/man
MANMODE?= 0444