blob: 31639c02f4c5b8fc8289fce8b9cbcfa865f85fe4 (
plain) (
blame)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
|
makefile: correctly sed paths
The default Makefile for tlp makes a mess with catenating `DESTDIR` to
everything, but then not actualy using the catenated (_ prefixed)
variables to sed it's `.in` files.
This patch makes sure that it correctly sets the paths, taking `DESTDIR`
in account where it makes sense (e.g. /bin where we want $out/bin) but
not where it doesn't (/etc/tlp.conf should be just that).
The reason DESTDIR is used at all, as opposed to the more appropriate
PREFIX, is covered in the nix formula, and is (also) due to the Makefile
being a bit "different."
diff --git a/Makefile b/Makefile
index e9bbab4..6b66651 100644
--- a/Makefile
+++ b/Makefile
@@ -51,19 +51,19 @@ _TPACPIBAT = $(DESTDIR)$(TPACPIBAT)
SED = sed \
-e "s|@TLPVER@|$(TLPVER)|g" \
- -e "s|@TLP_SBIN@|$(TLP_SBIN)|g" \
- -e "s|@TLP_TLIB@|$(TLP_TLIB)|g" \
- -e "s|@TLP_FLIB@|$(TLP_FLIB)|g" \
- -e "s|@TLP_ULIB@|$(TLP_ULIB)|g" \
- -e "s|@TLP_BATD@|$(TLP_BATD)|g" \
+ -e "s|@TLP_SBIN@|$(_SBIN)|g" \
+ -e "s|@TLP_TLIB@|$(_TLIB)|g" \
+ -e "s|@TLP_FLIB@|$(_FLIB)|g" \
+ -e "s|@TLP_ULIB@|$(_ULIB)|g" \
+ -e "s|@TLP_BATD@|$(_BATD)|g" \
-e "s|@TLP_CONFUSR@|$(TLP_CONFUSR)|g" \
-e "s|@TLP_CONFDIR@|$(TLP_CONFDIR)|g" \
- -e "s|@TLP_CONFDEF@|$(TLP_CONFDEF)|g" \
- -e "s|@TLP_CONFREN@|$(TLP_CONFREN)|g" \
+ -e "s|@TLP_CONFDEF@|$(_CONFDEF)|g" \
+ -e "s|@TLP_CONFREN@|$(_CONFREN)|g" \
-e "s|@TLP_CONF@|$(TLP_CONF)|g" \
-e "s|@TLP_RUN@|$(TLP_RUN)|g" \
-e "s|@TLP_VAR@|$(TLP_VAR)|g" \
- -e "s|@TPACPIBAT@|$(TPACPIBAT)|g"
+ -e "s|@TPACPIBAT@|$(_TPACPIBAT)|g"
INFILES = \
tlp \
|