diff options
| author | Roy Marples <roy@marples.name> | 2009-05-29 14:15:12 +0100 |
|---|---|---|
| committer | Roy Marples <roy@marples.name> | 2009-05-29 14:15:12 +0100 |
| commit | 83e82c452e89bf27de2a7b01bc2356c9050b2a18 (patch) | |
| tree | a4f8843c7c02a6b51abb06a16f0a9a6665facc71 /mk | |
| parent | 9c5faf231ccf50695270034ab63f747fa2bef1d7 (diff) | |
| parent | a518d34549fd80268e9c70d2300808b63c54825c (diff) | |
Merge branch 'master' of ssh://roy.marples.name/var/git/openrc
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/git.mk | 8 | ||||
| -rw-r--r-- | mk/scripts.mk | 2 | ||||
| -rw-r--r-- | mk/sys.mk | 2 |
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 @@ -35,6 +35,8 @@ LIBDIR?= ${UPREFIX}/${LIBNAME} LIBMODE?= 0444 SHLIBDIR?= ${PREFIX}/${LIBNAME} +LIBEXECDIR?= ${PREFIX}/libexec/rc + MANPREFIX?= ${UPREFIX}/share MANDIR?= ${MANPREFIX}/man MANMODE?= 0444 |