1 |
commit: 8c90042dee7cd0d7960c86b9fcfac5f1afec5784 |
2 |
Author: Andrew Gregory <andrew.gregory.8 <AT> gmail <DOT> com> |
3 |
AuthorDate: Tue Feb 12 22:09:49 2013 +0000 |
4 |
Commit: William Hubbs <williamh <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Feb 24 02:30:39 2013 +0000 |
6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/openrc.git;a=commit;h=8c90042d |
7 |
|
8 |
make BINDIR and SBINDIR available to input files |
9 |
|
10 |
BINDIR and SBINDIR can be set independently of PREFIX and may not be set |
11 |
to PREFIX/bin as scripts currently assume. |
12 |
|
13 |
Note from William Hubbs: |
14 |
|
15 |
This adds @BINDIR@ and @SBINDIR@ macros to the sed commands run to |
16 |
convert *.in files to the executable form. |
17 |
Signed-off-by: Andrew Gregory <andrew.gregory.8 <AT> gmail.com> |
18 |
|
19 |
--- |
20 |
mk/scripts.mk | 2 +- |
21 |
src/librc/Makefile | 2 ++ |
22 |
2 files changed, 3 insertions(+), 1 deletions(-) |
23 |
|
24 |
diff --git a/mk/scripts.mk b/mk/scripts.mk |
25 |
index 7a79821..2201199 100644 |
26 |
--- a/mk/scripts.mk |
27 |
+++ b/mk/scripts.mk |
28 |
@@ -12,7 +12,7 @@ _PKG_SED:= $(shell ${_PKG_SED_SH}) |
29 |
_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 |
30 |
_LCL_SED:= $(shell ${_LCL_SED_SH}) |
31 |
|
32 |
-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} ${_LCL_SED} |
33 |
+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' -e 's:@BINDIR@:${BINDIR}:g' -e 's:@SBINDIR@:${SBINDIR}:g' ${_PKG_SED} ${_LCL_SED} |
34 |
|
35 |
# Tweak our shell scripts |
36 |
%.sh: %.sh.in |
37 |
|
38 |
diff --git a/src/librc/Makefile b/src/librc/Makefile |
39 |
index 0b4beb2..7307560 100644 |
40 |
--- a/src/librc/Makefile |
41 |
+++ b/src/librc/Makefile |
42 |
@@ -18,6 +18,8 @@ SED_CMD= -e 's:@PREFIX@:${PREFIX}:g' |
43 |
SED_CMD+= -e 's:@LIB@:${LIBNAME}:g' |
44 |
SED_CMD+= -e 's:@SYSCONFDIR@:${SYSCONFDIR}:g' |
45 |
SED_CMD+= -e 's:@LIBEXECDIR@:${LIBEXECDIR}:g' |
46 |
+SED_CMD+= -e 's:@BINDIR@:${BINDIR}:g' |
47 |
+SED_CMD+= -e 's:@SBINDIR@:${SBINDIR}:g' |
48 |
|
49 |
_PKG_PREFIX= -e 's:.*@PKG_PREFIX@.*:\#undef RC_PKG_PREFIX:g' |
50 |
ifneq (${PKG_PREFIX},) |