From: Pietro Cerutti <gahr@gahr.ch>
Date: Mon, 23 Oct 2017 08:04:37 +0000 (+0000)
Subject: Update autosetup to latest master branch
X-Git-Tag: neomutt-20171027~10
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=26e98550ea348215f644e9c3f14001c99fe4f5e7;p=neomutt

Update autosetup to latest master branch

This includes the fix for a more fine-grained interaction between
$prefix, /etc, and /var.
See https://github.com/msteveb/autosetup/issues/31.
---

diff --git a/autosetup/system.tcl b/autosetup/system.tcl
index f049d31fe..2085fcfaf 100644
--- a/autosetup/system.tcl
+++ b/autosetup/system.tcl
@@ -283,15 +283,19 @@ foreach {name defpath} {
 }
 foreach {name defpath} {
 	datadir /share
-	sysconfdir /etc
 	sharedstatedir /com
-	localstatedir /var
 	infodir /share/info
 	mandir /share/man
 	includedir /include
 } {
 	define $name [lindex [opt-val $name $prefix$defpath] end]
 }
+if {$prefix ne {/usr}} {
+	define sysconfdir [lindex [opt-val sysconfdir $prefix/etc] end]
+} else {
+	define sysconfdir [lindex [opt-val sysconfdir /etc] end]
+}
+define localstatedir [lindex [opt-val localstatedir /var] end]
 
 define SHELL [get-env SHELL [find-an-executable sh bash ksh]]