summaryrefslogtreecommitdiff
blob: 9bdb561f5e1ce188fedd1bf184931bec5c033009 (plain)
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
From 555414c1da9acc1b59a08a316d0d4b5f87514025 Mon Sep 17 00:00:00 2001
From: Doug Goldstein <cardoe@cardoe.com>
Date: Tue, 28 Jun 2016 16:59:32 -0500
Subject: [PATCH 2/4] build: write updated variables to config.mk

Write the CFG_PREFIX stripped CFG_DATADIR, CFG_MANDIR, and CFG_INFODIR
to config.mk

Signed-off-by: Doug Goldstein <cardoe@cardoe.com>
---
 configure | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/configure b/configure
index 91b4f7d..0b23dcd 100755
--- a/configure
+++ b/configure
@@ -353,7 +353,10 @@ fi
 
 # a little post-processing of various config values
 CFG_PREFIX=${CFG_PREFIX%/}
+CFG_DATADIR=${CFG_DATADIR%/}
+CFG_INFODIR=${CFG_INFODIR%/}
 CFG_MANDIR=${CFG_MANDIR%/}
+CFG_LIBDIR=${CFG_LIBDIR%/}
 CFG_HOST="$(echo $CFG_HOST | tr ',' ' ')"
 CFG_TARGET="$(echo $CFG_TARGET | tr ',' ' ')"
 
@@ -406,8 +409,10 @@ putvar CFG_PREFIX
 putvar CFG_BUILD
 putvar CFG_HOST
 putvar CFG_TARGET
-putvar CFG_LIBDIR
+putvar CFG_DATADIR
+putvar CFG_INFODIR
 putvar CFG_MANDIR
+putvar CFG_LIBDIR
 putvar CFG_RUSTC
 putvar CFG_RUSTDOC
 
-- 
2.7.3